merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 27 Nov 2009 20:17:40 +0000 (21:17 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 27 Nov 2009 20:17:40 +0000 (21:17 +0100)

Trivial merge