merge of '0dc157d146c11b00a52d985950481dd2a8c370de'
authorThomas Kunze <thommycheck@gmx.de>
Sun, 27 Jul 2008 17:20:15 +0000 (17:20 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Sun, 27 Jul 2008 17:20:15 +0000 (17:20 +0000)
     and '6ee0dff6c561c5d9ad21138f2fc8a037a98fa6d0'


Trivial merge