merge of '439075141b0d6ffd64c201829b5e172db68ef97e'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 15:47:46 +0000 (15:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 15:47:46 +0000 (15:47 +0000)
commitac8b729e1af278982c713e9317dc2f13ee50d186
treeb6ba24d9a14c7112b11401934707e02e63701371
parent5d24a4f916c1491f5d44406a899569d2bb306874
parentec6aa86a7a792dcf9ec695c25a5e621e361a5e9f
Merge ... '439075141b0d6ffd64c201829b5e172db68ef97e'
     and 'f2cd2a30cb6f115f92cd1c1e84bfb040f0a12597'