Merge branch 'hansi'
authorClifford Wolf <clifford@clifford.at>
Sun, 17 Mar 2013 08:18:00 +0000 (09:18 +0100)
committerClifford Wolf <clifford@clifford.at>
Sun, 17 Mar 2013 08:18:00 +0000 (09:18 +0100)

Trivial merge