merge of '2c5004d72a3f70fdae1b53fd5cfe6b9ba04648c1'
authorThomas Kunze <thommycheck@gmx.de>
Sat, 8 Mar 2008 12:57:25 +0000 (12:57 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Sat, 8 Mar 2008 12:57:25 +0000 (12:57 +0000)
     and 'a165e975aad0f13da309bb70051fe1419481cb0a'


Trivial merge