merge of 'd03c32ee4bd5625c28af8c8b33920944d499eef6'
commit05d3651370b20befe6008b55bfc7231e1a6ab55c
authorJohn Bailey <rekkanoryo@rekkanoryo.org>
Sun, 8 Nov 2009 23:38:08 +0000 (8 23:38 +0000)
committerJohn Bailey <rekkanoryo@rekkanoryo.org>
Sun, 8 Nov 2009 23:38:08 +0000 (8 23:38 +0000)
tree4bd5f2862e79a43b9e20c086dd57a0635c95028f
parent03551db1801f574c1105ef991dd9ced353285d50
parent1bf396d51155391263de65c3754154ab49079164
Merge ... 'd03c32ee4bd5625c28af8c8b33920944d499eef6'
     and 'ef61075f9587fbc4b2558d5e4a3f8d9194d901a7'

--HG--
branch : next.minor
extra : convert_revision : 41372e88b17179e87ec17daec7e464d413ef69d7