merge of '763273dbe0f8c69b58cb50ad1ae4131199baa08e'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 24 Jun 2008 20:26:47 +0000 (20:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 24 Jun 2008 20:26:47 +0000 (20:26 +0000)
commitc8847dc637e81dd1b8751ce1c50c0b4cfd0922ad
tree5d77b25e26002dbeef391cc3cdf5f8be16a82465
parent737965b2f66d3118ba67b417273be1510d09ec23
parent561ae8afba41ca0d712713acd11e1865f2f208df
Merge ... '763273dbe0f8c69b58cb50ad1ae4131199baa08e'
     and 'b17e85be6490338fbc06d2ddf191cc651822a42d'