Merge remote branch 'remotes/ziplib-loc/master'
authorKonrad Rosenbaum <konrad@silmor.de>
Tue, 6 Dec 2011 06:53:33 +0000 (07:53 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Tue, 6 Dec 2011 06:53:33 +0000 (07:53 +0100)

Trivial merge