merge of '608b2b53305bf9caac347482f81437fb57e6205b'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 11 Jul 2008 09:12:33 +0000 (09:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 11 Jul 2008 09:12:33 +0000 (09:12 +0000)
commitf341777c4bf277731c4ff8b776f09ad38ed4f00b
treed4bd87ced41aa4c67bdc50a83bd50f67b58a0d6e
parent0c51bf951cdee42392c6cb565b7a82d9975a0d72
parent1af32f8a798caba849145cba080006ff7d2e6376
Merge ... '608b2b53305bf9caac347482f81437fb57e6205b'
     and '762688ff3c4f669a807e2559bb786cc82118b7bb'