merge of '2adf3ab14059d254166005fe0eb52600889af8da'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 19 Oct 2006 19:40:21 +0000 (19:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 19 Oct 2006 19:40:21 +0000 (19:40 +0000)
commitb5a18ffe5f72403f20603eba24bec52f9c7c5e33
tree0b4ddca683ad0353d741f6e349f8f61491b8aed6
parent5920af596603366bf59479bd757bbd01475a090e
parenteb2a9729b6fcfa1edc02ccfb9bef4ce02b26ba95
Merge ... '2adf3ab14059d254166005fe0eb52600889af8da'
     and 'dbda74ec56dedcfca0de706b94ec595c8a0a9233'