Merge branch 'master' into cooking
authorWolfgang Bumiller <blub@speed.at>
Sun, 21 Apr 2013 10:37:06 +0000 (12:37 +0200)
committerWolfgang Bumiller <blub@speed.at>
Sun, 21 Apr 2013 10:37:06 +0000 (12:37 +0200)

Trivial merge