merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 12 Nov 2010 22:03:29 +0000 (23:03 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 12 Nov 2010 22:03:29 +0000 (23:03 +0100)

Trivial merge