merge of 'd486b07ff3f411bc579cba692283881327e49742'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 6 Aug 2007 19:31:33 +0000 (19:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 6 Aug 2007 19:31:33 +0000 (19:31 +0000)
commit71cd75a213bb84bce4e549ee8e706f59d25df0a6
treee8926624ca7df691e64135dbcfc988dbcf70e6c8
parentd176cd1e6ca20969457b05be43fdaf885e08df02
parent536be8a5c6846d5ff1fc4eb43bff0c04928deb57
Merge ... 'd486b07ff3f411bc579cba692283881327e49742'
     and 'd80fca2b777ef3a788e49ac766b51ac24e27b4fa'