merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 12 Nov 2010 10:36:58 +0000 (11:36 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 12 Nov 2010 10:36:58 +0000 (11:36 +0100)

Trivial merge