merge of '16286a015e02dffbcbc2f42586e7402f16dba818'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 24 Jul 2008 08:52:10 +0000 (08:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 24 Jul 2008 08:52:10 +0000 (08:52 +0000)
commit5d179cbdfeb400980bcf0c31f87f55017d677e1b
tree2ce31b78d1664cdb580864e88f530276fc55a7be
parentd948d16754b7cda41bf4ab402d410dee306bd599
parentdb6d312d3a5527113fbfbfb56ab13e4c9dfc81ca
Merge ... '16286a015e02dffbcbc2f42586e7402f16dba818'
     and '4e6e5c3a6954f62ae6b6233d225415fb8a185151'