merge of '4bec655b605d8fc1eea8743bc9be4757e76d3378'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 21 Feb 2008 12:48:10 +0000 (12:48 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 21 Feb 2008 12:48:10 +0000 (12:48 +0000)
     and 'a4fd1ebbad86c9ca9625a5140b86bf868fdef17e'


Trivial merge