merge of '12ff563eb00759b6cae9ecfc5c1400f246dcd533'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 16 Oct 2006 13:32:42 +0000 (13:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 16 Oct 2006 13:32:42 +0000 (13:32 +0000)
commit929850f6a2ddba9f7e7c10ddd88b34be8e6b7d3d
tree5ce8db434b12b38ba08cdbffe67af67c0bf2948b
parent498da442cc5f9503c7a37376b9da364213c35f77
parent76fa77c6f13396d5bae79b7e37f27ba8fb207df6
Merge ... '12ff563eb00759b6cae9ecfc5c1400f246dcd533'
     and '3763af0dd8f9b6f2ec526ab6fcef3a00efd7576e'