Merge branch 'karushka'
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 3 Jul 2009 08:40:58 +0000 (10:40 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 3 Jul 2009 08:40:58 +0000 (10:40 +0200)

Trivial merge