Merge remote branch 'refs/remotes/origin/master'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 28 Dec 2010 09:38:32 +0000 (10:38 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 28 Dec 2010 09:38:32 +0000 (10:38 +0100)

Trivial merge