Merge branch 't/patch165'
commitf47a27ae407fc17a19ccebfb5caa334f66daac8c
authorJohn Wiegley <johnw@newartisans.com>
Wed, 28 Jul 2010 06:33:56 +0000 (28 02:33 -0400)
committerJohn Wiegley <johnw@newartisans.com>
Wed, 28 Jul 2010 06:33:56 +0000 (28 02:33 -0400)
treebeae932ec670bd78c74d2e722ff7c74150203abd
parentd91ce1490d31570d4ebe81b156ed4e922a66ffcc
parent344f860bb82a1d08f041f7c1caaef83a6722265c
Merge branch 't/patch165'