merge of 'a153d288427652523d9cf6ef78faccfc723035d5'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 21 Jul 2008 11:38:32 +0000 (11:38 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 21 Jul 2008 11:38:32 +0000 (11:38 +0000)
     and 'd910c68cbd1dafb9c6b77187abde5e456d8606e9'


Trivial merge