Merge branch 'master' of ssh://git.pk910.de:16110/srvx
authorpk910 <philipp@zoelle1.de>
Mon, 26 Dec 2011 14:38:44 +0000 (15:38 +0100)
committerpk910 <philipp@zoelle1.de>
Mon, 26 Dec 2011 14:38:44 +0000 (15:38 +0100)

Trivial merge