merge
authorStefan Behnel <scoder@users.berlios.de>
Sat, 21 Feb 2009 21:34:25 +0000 (22:34 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 21 Feb 2009 21:34:25 +0000 (22:34 +0100)

Trivial merge