Merge branch 'bug-897' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 21 Jul 2011 12:41:54 +0000 (14:41 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 21 Jul 2011 12:41:54 +0000 (14:41 +0200)
commita9cf76bebbae1d26b558f55daf6fa59ebfda91b1
tree1e52292bc7c2ad24c3fb7ff7a20013dc3ce7422e
parentad05aab44ae1995a9db6323785fe29402a1a5e69
parentf3c4fd715d125b83cbb35746787b840431270560
Merge branch 'bug-897' into release