merge of 'd94f0c673a273066ff54e6843a2b270742cbb1dd'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 09:59:33 +0000 (09:59 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 09:59:33 +0000 (09:59 +0000)
     and 'e2ebba6df8e583819b643aeb9f262e9f7803837d'


Trivial merge