Merge remote-tracking branch 'origin/variant_dev' into variant_dev
authorJohannes Schanda <schanda@itestra.de>
Wed, 16 Jan 2013 14:08:18 +0000 (15:08 +0100)
committerJohannes Schanda <schanda@itestra.de>
Wed, 16 Jan 2013 14:08:18 +0000 (15:08 +0100)

Trivial merge