merge of '368c3f8ff3b1b9dcaff963660d353cc8e2739101'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 16:45:26 +0000 (16:45 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 16:45:26 +0000 (16:45 +0000)
commit090b0af980c6f5e66e3127ceb4c41fec869beda6
tree35c5ce737aa82b0367aaba246a8474214371e346
parent80b25c25786a838e45da53567321bd349ca1bb2c
parent855e726ee6828acc815664dea2b80f4cab4dcec7
Merge ... '368c3f8ff3b1b9dcaff963660d353cc8e2739101'
     and 'f350641f3893143efec22c74299cdeeae73af124'