merge of '3f2ba26557bb371913a11a48aa9bcb4f58fd6fe5'
authorRobert Schuster <thebohemian@gmx.net>
Sat, 26 Jul 2008 20:07:54 +0000 (20:07 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sat, 26 Jul 2008 20:07:54 +0000 (20:07 +0000)
     and '4a6eea520cb0bded1313d57689af2993701d4e87'


Trivial merge