merge of '1f413a8fc168cbef64fe984af210e9d998cc3382'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 12:39:46 +0000 (12:39 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 12:39:46 +0000 (12:39 +0000)
commit18215b5eb4195eccf9b8257805948aa9a9344c96
tree0c73d25237e0bfe91cc64315ae35187ed715ea37
parent944a05fb7320ce45e14e6af46904c3ab08ea0dca
parent97f96962e8c3e621dbc15936ab8cbcc2a8c84a33
Merge ... '1f413a8fc168cbef64fe984af210e9d998cc3382'
     and '29d2dfa77e02cc2f8721d7954eb27c061486b2f4'