merge of '5a3a0499fceb6465dab6ed321713520ddb11b854'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 13 Jan 2007 13:37:18 +0000 (13:37 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 13 Jan 2007 13:37:18 +0000 (13:37 +0000)
commitf156a182e7f4be1ec4a17355a44a02283f0ba82c
treeb3ef898e0c7331b6fd0bcde3baf222fef00ff891
parent8b2b49338648be69c6cefb68358e934101cd489f
parent9f467916a1df9897c703e59fc6c979e3fc277491
Merge ... '5a3a0499fceb6465dab6ed321713520ddb11b854'
     and 'eb2b566b24f4dd2148641b262bb2abd63431eb19'