merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 27 Feb 2009 05:34:39 +0000 (06:34 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 27 Feb 2009 05:34:39 +0000 (06:34 +0100)

Trivial merge