merge of '2872bcba5019558c0d77e8cf9b43801167e5efc8'
authorJohn Bailey <rekkanoryo@rekkanoryo.org>
Thu, 21 Oct 2010 03:53:37 +0000 (03:53 +0000)
committerJohn Bailey <rekkanoryo@rekkanoryo.org>
Thu, 21 Oct 2010 03:53:37 +0000 (03:53 +0000)
commiteb3d48199c27b4ef6f87501035e94a0aa19f6909
treef4651621b1e5f73216f5a2a8251cc9f6303c8a35
parent7f1473f37874c38911af81976c30cc80432aef62
parent2b29d80d5f1eb6b006fde1171a06576c20057cd0
Merge ... '2872bcba5019558c0d77e8cf9b43801167e5efc8'
     and '3cb4024617c6b97a4c383ddcabe7f047af92f68c'