merge of '35d00516005b1f33ef42cecb0350a20a51723706'
authorThomas Kunze <thommycheck@gmx.de>
Sun, 27 Jul 2008 15:12:12 +0000 (15:12 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Sun, 27 Jul 2008 15:12:12 +0000 (15:12 +0000)
     and 'c167fd3cbb5184fbfe56dff8fbb57e988ce58f51'


Trivial merge