merge of '38476bfe431d934d649d515b180a82ed3e550822'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 2 Oct 2008 09:26:22 +0000 (09:26 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 2 Oct 2008 09:26:22 +0000 (09:26 +0000)
     and '4fe9c4e8b248a850a5ab4ace667e3bade4448505'


Trivial merge