merge of '63238ec5d594052d5284fab3a6fc891dff49f06e'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 12:17:38 +0000 (12:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 12:17:38 +0000 (12:17 +0000)
commit7841ac0afb3362ba085128a68bd438ddcb265300
tree7fa761d71852cac7cd73f82ced5067ba1fda6736
parent06312eba71432aa2d9e0ed64ebacefd09b12b245
parent0cbc99b3358d1831bc920816c7e5815aa6533406
Merge ... '63238ec5d594052d5284fab3a6fc891dff49f06e'
     and 'e81217cc14efcd0128a1505bf7bb9e4f56021559'