merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 25 Feb 2011 20:10:22 +0000 (21:10 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 25 Feb 2011 20:10:22 +0000 (21:10 +0100)

Trivial merge