merged in Vitja's generators fix
authorStefan Behnel <scoder@users.berlios.de>
Tue, 19 Apr 2011 07:17:15 +0000 (09:17 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Tue, 19 Apr 2011 07:17:15 +0000 (09:17 +0200)

Trivial merge