merge of '1b0d358e4f17bb597966cdc2eb4e9cb40b10077c'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 12 Mar 2008 13:07:47 +0000 (13:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 12 Mar 2008 13:07:47 +0000 (13:07 +0000)
commit86d3d6384ea9f7a9313b7d2cbdb126164d47b639
tree659ce0f4eeb586836243eaf0050e66db203f0426
parent5375dca014dd563f1dd5c86389f0ef2989542fe9
parent33b304d6d8413e7c1993aae8aef509a58dd59036
Merge ... '1b0d358e4f17bb597966cdc2eb4e9cb40b10077c'
     and '64c15490c8902f07d7a60dd16090b960f56c4db7'