merge of '93ee90ab50c3c8b253484466785fc6af7584f05a'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 00:53:45 +0000 (00:53 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 00:53:45 +0000 (00:53 +0000)
commit341893d0892241a950af029dc61f2685eb63b426
treef383e3f1dbb5922fa6d777c6f81b81ea8563c3eb
parenteccb6f8471bef72ddfcfbcc2b6f67df68d17b303
parent3d406da3ff0b55d944afd9521c7e26ad614ff3ac
Merge ... '93ee90ab50c3c8b253484466785fc6af7584f05a'
     and 'c3c391eb3a506332e2baf39f0412a362bf17add8'