merge of '7ac1631904ff857a0e9ed8eabad7d3bb2cde797a'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 22 Sep 2008 21:58:56 +0000 (21:58 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 22 Sep 2008 21:58:56 +0000 (21:58 +0000)
     and 'f8b059d4fa30751c4f6fddabedcf7b022798effe'


Trivial merge