merge of '6bc2006eb8eff633170fcf544612bf6bcc7be7be'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 2 Apr 2007 15:57:09 +0000 (15:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 2 Apr 2007 15:57:09 +0000 (15:57 +0000)
commit86f1ccf58b2eab92ff7e65d9fe53ebcecc94bd5e
tree1f4c10bc206ffeb73e763e88bf63bdd25a647ff0
parente7e153b6e9e35a376f1418a4239ad52a4716c40e
parentaa34d129b1ff396d8f2c16b74bbbb50e9101f313
Merge ... '6bc2006eb8eff633170fcf544612bf6bcc7be7be'
     and 'ead450bbb0c7341954f358ef2d76fc6268c68846'