Merge branch 'hansiglaser-master'
authorClifford Wolf <clifford@clifford.at>
Tue, 19 Mar 2013 12:47:46 +0000 (13:47 +0100)
committerClifford Wolf <clifford@clifford.at>
Tue, 19 Mar 2013 12:47:46 +0000 (13:47 +0100)

Trivial merge