Merge branch 'hansi'
authorClifford Wolf <clifford@clifford.at>
Mon, 18 Mar 2013 06:33:53 +0000 (07:33 +0100)
committerClifford Wolf <clifford@clifford.at>
Mon, 18 Mar 2013 06:33:53 +0000 (07:33 +0100)

Trivial merge