merge of '6e8259e13dda6b19a59db6751153b5e9583486e2'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 10 Jul 2007 16:41:35 +0000 (16:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 10 Jul 2007 16:41:35 +0000 (16:41 +0000)
commit7cdc1d823b9b13836092c87a80e59b9ff720dd4c
tree05d58a2ee4ae0b742eac39e1d860ab4ce1399189
parent8d7824dc72be5193f1f22c631434eaef77dec5ce
parentb637757122ebc8d238076b894c05a5d0bb2bd416
Merge ... '6e8259e13dda6b19a59db6751153b5e9583486e2'
     and '79a8be76eb7e634035b02729b67f9179fabb8711'