merge of '96db59323d7ef9906344cc1f7228b381c996ab07'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 3 Apr 2008 22:04:36 +0000 (22:04 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 3 Apr 2008 22:04:36 +0000 (22:04 +0000)
     and 'd69636e5f2a11a4de46efbbc1b4972a8a0186d3b'


Trivial merge