merge of '3af6bdfc4ccbbb12c35ea36591901cd509d630b0'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 10 Oct 2008 14:07:04 +0000 (14:07 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 10 Oct 2008 14:07:04 +0000 (14:07 +0000)
     and '5b390d09e0870f8caae7a83db36d02ec8805ed4e'


Trivial merge