merge of '1e903c1b7aaf83f6d6191a71231f8862e397e14c'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 7 Jul 2008 19:06:13 +0000 (19:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 7 Jul 2008 19:06:13 +0000 (19:06 +0000)
commit1f73b34c676b7bb2864063b83174c07c9a29d7fb
tree90a054fff91dc7588a24454d7d0fe4108d003f52
parent9309b934b99abff81ceefc6015185cf41f75a833
parentaa5f46f3e76276ae2e5589a0bfd78568c9321b56
Merge ... '1e903c1b7aaf83f6d6191a71231f8862e397e14c'
     and 'da05681cb6f999dad9c83e628cb1825a48233318'