merge
authorStefan Behnel <scoder@users.berlios.de>
Sat, 14 Mar 2009 22:05:09 +0000 (23:05 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 14 Mar 2009 22:05:09 +0000 (23:05 +0100)

Trivial merge