merge of '3a70542f110b6c428973d43745b25017469e203f'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 10 Jan 2008 16:52:03 +0000 (16:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 10 Jan 2008 16:52:03 +0000 (16:52 +0000)
commit7e8411a730dbfa42b70ac583e14f64bd0465f2a3
tree70b08dacd36fefd9eab61c6faf89914ea56820ad
parent47ef4e858150f09a217f5914d36096ab0bde9548
parenteef94a6668fcad4b87381abea3ee84192f3fdccb
Merge ... '3a70542f110b6c428973d43745b25017469e203f'
     and '63b3be114577f06e728c111b2fda61626ac3faaa'