Merge remote-tracking branch 'gerrit/2012.10' into MasterMerge
authorLars Kneschke <l.kneschke@metaways.de>
Fri, 25 Jan 2013 16:37:11 +0000 (17:37 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Fri, 25 Jan 2013 16:37:11 +0000 (17:37 +0100)

Trivial merge