merge of 'd1d4ee2c6e573657511ea5110c7b0ff2cd6b7ba8'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 17 Sep 2007 16:14:47 +0000 (16:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 17 Sep 2007 16:14:47 +0000 (16:14 +0000)
commite9a1caa7811d14b5cd60bae5a66ba95cd2bf0a8f
tree68298b3d3e40c15b6c1fc357388301546eb6523a
parentf701f850f0caaa282c9a799184978fea0233d561
parente261104fb3383d7e3a73ad340adfdf11df2c961a
Merge ... 'd1d4ee2c6e573657511ea5110c7b0ff2cd6b7ba8'
     and 'd22fdb6dd89df0e5bc4ba3614166c769bb207126'