merge of '52b9d3a5d26a11cc7dbe318e7eb6f1c3f6022b82'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 22 Sep 2008 22:00:12 +0000 (22:00 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 22 Sep 2008 22:00:12 +0000 (22:00 +0000)
     and '5f87d1f1d728ca3992204c4cc56b070c3c58ac25'


Trivial merge