merge
authorStefan Behnel <scoder@users.berlios.de>
Tue, 29 Mar 2011 06:56:30 +0000 (08:56 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Tue, 29 Mar 2011 06:56:30 +0000 (08:56 +0200)

Trivial merge