merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 16 Oct 2009 09:51:55 +0000 (11:51 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 16 Oct 2009 09:51:55 +0000 (11:51 +0200)

Trivial merge