merge of '99b4c2c5cc4144822d6a86158e68432fb854563c'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 9 Oct 2008 09:26:17 +0000 (09:26 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 9 Oct 2008 09:26:17 +0000 (09:26 +0000)
     and '9a0857ebdef17f18989f0702e43595ce522a7a24'


Trivial merge