merge of '86a5f47962135f70129fec6720614b66a7b08532'
authorJohn Bailey <rekkanoryo@rekkanoryo.org>
Tue, 19 Oct 2010 03:11:12 +0000 (03:11 +0000)
committerJohn Bailey <rekkanoryo@rekkanoryo.org>
Tue, 19 Oct 2010 03:11:12 +0000 (03:11 +0000)
commit3313abc70db2e5e7781d50d65eaf3fc871ad5f43
tree75f97da0fda65f40c899e1beaf768379325af174
parentd7c31ab1dea1e55616effe48c71cb725b3f5e7dd
parent496f3ab7b0ab969cb1c0badbfb636fd52c28a6ff
Merge ... '86a5f47962135f70129fec6720614b66a7b08532'
     and 'b5a241943187497bbbdc81af15bcbe029ac2b2dc'