merge of '0ac48f1fc79ebbccb1647c7d31278fc06fe421ef'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 20 Dec 2007 17:21:51 +0000 (17:21 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 20 Dec 2007 17:21:51 +0000 (17:21 +0000)
commit7b2f0f5182290ebfe022a12d5fc1b34f9fbc000c
tree52d8f13c17fdefc57429208a4e1d27ac5473e375
parent5b6afaaee0d760f91d1bb77fd20bc2e2275c097b
parent540f6cd2c373497fa790b31f7b2e195adb3cddea
Merge ... '0ac48f1fc79ebbccb1647c7d31278fc06fe421ef'
     and '96df5dae22f2fb36fef351f22763d1b0524d1dfa'