merge of '01bddb578c9dd04edfbb56d0c1c15f81b4161479'
authorRobert Schuster <thebohemian@gmx.net>
Sun, 13 Jul 2008 22:42:06 +0000 (22:42 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sun, 13 Jul 2008 22:42:06 +0000 (22:42 +0000)
     and '400e8684128097359c7f2556772f3c2e15c3e752'


Trivial merge