merge of '9861e003b5708862835bc85f2778f44088811aa4'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 26 Sep 2008 18:42:26 +0000 (18:42 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 26 Sep 2008 18:42:26 +0000 (18:42 +0000)
commit755318a027d0e2bc8c3fa2a1de3dae6b4c8c0ee8
tree09b5bcb3e761c00516bdeb9348e9dc0847608415
parentc7c678114ca9242c676afed4b9ec51e3ae6bbf72
parent7e42a21601eba9f804593f04a55a4f7efe448b3e
Merge ... '9861e003b5708862835bc85f2778f44088811aa4'
     and 'ee41789a9c3e50ef34fdcef75b3487b4f3508184'