merge of '24a01b709a1340721c80ac90b928ab9d4e1ea0be'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 22:23:24 +0000 (22:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 22:23:24 +0000 (22:23 +0000)
commit873413a3c34c92913c9829a85e800f0ff083d443
tree8fb9faacaeafbf26e9ed2b1a790b5da68b6ac3b2
parentdb409a7ab3c8f7f5ea00f9aa98b59de6ac55bd89
parentfbd816ca00ebf11edc7e8944aee9bb2d2325ce06
Merge ... '24a01b709a1340721c80ac90b928ab9d4e1ea0be'
     and '60842b466603b662ce4ff57d65e2d0ff713c018e'