merge of '838a60f4684a5fe71ade31d05fb35609808420d1'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 13:17:47 +0000 (13:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 13:17:47 +0000 (13:17 +0000)
commit3132dda632526f8e2b224e3485a3cc8a64df3be7
tree00e04f1ff0e8f1d8250697a9014c15579505c31d
parent270f600e7bfb078e0d568ae8c2c0727f9e140af3
parent11708d352d0844ceb309221b5660d8c7c7ec790e
Merge ... '838a60f4684a5fe71ade31d05fb35609808420d1'
     and 'caed6636e646bb9b999bfe3a3234c92da9e20252'