merge of '0c6c5626491aa3d427ad2222eaa182e53154da9e'
authorThomas Kunze <thommycheck@gmx.de>
Sun, 3 Aug 2008 23:40:54 +0000 (23:40 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Sun, 3 Aug 2008 23:40:54 +0000 (23:40 +0000)
     and '1b38165e32339d1af5c9bb0a0200860939e559b3'


Trivial merge