merge of '560558ea6e0ea810e06402a8fd1e19d8c46e68c6'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 12:26:40 +0000 (12:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 12:26:40 +0000 (12:26 +0000)
commit401dc665fbf97899503cfdaa627bd8cb8e5c91ee
tree5ab2ae73011241b0ac9f5cc5619d2f42a6a75032
parentf74c56ff61c252a581d0363acd910b71338586eb
parent1c4fbce5fa2e366111b564983ded5631eb7e2f19
Merge ... '560558ea6e0ea810e06402a8fd1e19d8c46e68c6'
     and 'b6fba5effb9e585b64323f16d607259748d6246f'