merge of '915c245097ab5f04957b45d8b76b60ece103e80d'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 5 Feb 2008 15:06:51 +0000 (15:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 5 Feb 2008 15:06:51 +0000 (15:06 +0000)
commit4b600ea2be80e9deb9dd621f83b7bb13e2811b0f
tree697a3a317a79fa97044a1cefab67904686d6b361
parentd0b2e36e50686c2226a2a10971071c929adcfaf7
parent55fe052dcad7c194336adf5110aace80213f752e
Merge ... '915c245097ab5f04957b45d8b76b60ece103e80d'
     and 'bbd1c5e5e326b89d4cec6873eace6419f6d5130c'