Merge branch 'master' into blub/bc3
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sat, 11 Aug 2012 09:32:12 +0000 (11:32 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sat, 11 Aug 2012 09:32:12 +0000 (11:32 +0200)

Trivial merge