merge of '2b134fb4a5278b379deec7fbafe34576ac3f266c'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 6 Mar 2008 17:13:43 +0000 (17:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 6 Mar 2008 17:13:43 +0000 (17:13 +0000)
commit73390c1949090ef86084b3d817474c1c7cdeed28
tree4789f5bd63505a33f27a59456ad00d30add4073b
parent9ce9cc1d57bb17dbc03a0a9ecc744e2778759e36
parent0b80abf3a5a3256700ca39d5a41b8c5877f3080c
Merge ... '2b134fb4a5278b379deec7fbafe34576ac3f266c'
     and 'e86cbb0aa6849e39a142ce4c582d140b921326d1'