Merge branch 'bug-876' into release 2010-11-23
authorMichael Tänzer <neo@nhng.de>
Tue, 23 Nov 2010 19:51:01 +0000 (20:51 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 23 Nov 2010 19:51:01 +0000 (20:51 +0100)
commit01fd34e200f3427a0424e7ae8bd03ef448fb6378
treef60e05a556abe18f6ad1bae144f140023b6a7a3d
parent1ff27b7cd83f1e9f218918f5cdc3b617fd7735e3
parent96448c95722cb358edc37ced9c70dc146dd5ad35
Merge branch 'bug-876' into release