merge of '1b17ea5d09e29a9b9960e907c6a56908b349ff98'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 26 Jun 2008 18:55:47 +0000 (18:55 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 26 Jun 2008 18:55:47 +0000 (18:55 +0000)
     and '60512e4106703c7bf44fad424ce575f2496d82a9'


Trivial merge