merge of 'f25e814777918418878b42fe11ce22b7febcbb8c'
commita042ae885629598c7459c308c21bc507cebe423d
authorJohn Bailey <rekkanoryo@rekkanoryo.org>
Tue, 18 Aug 2009 03:39:43 +0000 (18 03:39 +0000)
committerJohn Bailey <rekkanoryo@rekkanoryo.org>
Tue, 18 Aug 2009 03:39:43 +0000 (18 03:39 +0000)
tree133661062f23c039036ee3435e526dcdfc5c7ab4
parentf7ab7d1752f2a2b00c6857808ae9aad158ca1040
parent0b6a3877d1f28dba6e9c749a65c52c61b3c7f3d0
Merge ... 'f25e814777918418878b42fe11ce22b7febcbb8c'
     and '114db779ec190b4f3c3d2dbcaaf3c6caee1382c9'

--HG--
extra : convert_revision : d6127034539bfd7c911dcc2ffab1ca7bc7e99dbb
ChangeLog
NEWS