merge of '7ba62c1bc5f5f44c638e1e5f4805429a188ca3a6'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 21 Aug 2008 15:44:29 +0000 (15:44 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 21 Aug 2008 15:44:29 +0000 (15:44 +0000)
     and 'a211067fbce0623d7710d98f40f12ce3a2247ecf'


Trivial merge