merge from joerg
authorMike O'Connor <stew@vireo.org>
Wed, 12 Oct 2011 02:25:01 +0000 (22:25 -0400)
committerMike O'Connor <stew@vireo.org>
Wed, 12 Oct 2011 02:25:01 +0000 (22:25 -0400)
commitee203f1829d19cc02f9b33c24e47e05851471826
tree7a4a7b1afadf4605a1f7a667131a362523fc8984
parent4d70ff7478ca666802e809a418ece28266fc5e40
parent8278a16022d157a6c5f57cfa7d5f867fdbc72ef3
merge from joerg

Signed-off-by: Mike O'Connor <stew@vireo.org>
movein