merge of 'ae8724641e6c8131ac3706e49cd36a7e993fc697'
authorRobert Schuster <thebohemian@gmx.net>
Sun, 5 Oct 2008 15:31:39 +0000 (15:31 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sun, 5 Oct 2008 15:31:39 +0000 (15:31 +0000)
     and 'e74e0c0ff5084d996f1c4b3b2c87244159a057ee'


Trivial merge