merge of 'aaa315ace8e5a65feb9e95d2a87bb19cf744b860'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 14 Feb 2008 10:04:47 +0000 (10:04 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 14 Feb 2008 10:04:47 +0000 (10:04 +0000)
     and 'd625decf5e60fa8f122af65024dbcaad6a1f0b19'


Trivial merge