merge of '93c92c2d118afa75e8263141e4da9395b50eea98'
authorRobert Schuster <thebohemian@gmx.net>
Sun, 10 Feb 2008 02:50:32 +0000 (02:50 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sun, 10 Feb 2008 02:50:32 +0000 (02:50 +0000)
     and 'e59aa2cab1515e8858debb81984c8596f07ad7c0'


Trivial merge