merge of '560558ea6e0ea810e06402a8fd1e19d8c46e68c6'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 12:46:01 +0000 (12:46 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 12:46:01 +0000 (12:46 +0000)
commitb1a30ab11ddf21a93e41a404e95c84cd1503f0e4
treea8e974913c36b4e5aa933bfbc70c429ef9af3178
parentf74c56ff61c252a581d0363acd910b71338586eb
parent9788af13b2fdb7d03aa53c429eddccfa92ca5e75
Merge ... '560558ea6e0ea810e06402a8fd1e19d8c46e68c6'
     and 'fd2e08736e0fe9e7ddd372595adb5f733bc2ca19'