Merge remote branch 'remotes/dptr-loc/master'
authorKonrad Rosenbaum <konrad@silmor.de>
Tue, 6 Dec 2011 19:38:00 +0000 (20:38 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Tue, 6 Dec 2011 19:38:00 +0000 (20:38 +0100)

Trivial merge