merge of '1c73904856884cc56a3b02b8110c11919575b238'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 3 Jul 2008 17:58:48 +0000 (17:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 3 Jul 2008 17:58:48 +0000 (17:58 +0000)
commit0d2156181bdc551b54bb916e4b56a11a9917fb57
treea1d08a4a14bd6389ecf0c2b612f98f77a6cba644
parent5b84c61ca405f8002bf053a60c22ff8cd66bfd1d
parent403e16fa076f702a357c12df00a7c2637b9b9c24
Merge ... '1c73904856884cc56a3b02b8110c11919575b238'
     and 'a422dee552d817f3e19c622778fb2321caa93c94'