Merge branch '2012.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Nov 2012 09:11:15 +0000 (10:11 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Nov 2012 09:11:15 +0000 (10:11 +0100)

Trivial merge