merge of 'be23a3d9c964660487451387d6318c3915ad5b51'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 22 May 2008 10:50:18 +0000 (10:50 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 22 May 2008 10:50:18 +0000 (10:50 +0000)
     and 'd84d3829b2f6a4c1d1cb91496cd7ffa088ed323f'


Trivial merge