merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 29 Jan 2009 21:49:02 +0000 (22:49 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 29 Jan 2009 21:49:02 +0000 (22:49 +0100)

Trivial merge