merge of '1f88d7bce0e63ddda3e634a6aff8bcf09fc97ed7'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 19:27:26 +0000 (19:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 19:27:26 +0000 (19:27 +0000)
commit4880ad5a25883d37116c857b58424d397402c23e
treebe1e0b702a5e012c1be22f1260142c2b221c99b2
parent3b7ea13cbd6916d7a0855411573598c52afb4290
parent0bf5a6a8d22ab206b36b2bc7a54ef30c83a9e8d8
Merge ... '1f88d7bce0e63ddda3e634a6aff8bcf09fc97ed7'
     and 'f5e925a4d49eda729a2458839beb6944538b4ece'