merge of '2f09abb6c6399a0d986a8e19fb17a4bb638c1538'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 15:00:05 +0000 (15:00 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 15:00:05 +0000 (15:00 +0000)
commitfb9a0a7d806b76f42fa2373097b3f3a095d04252
tree4482cfb2c9f39fde363744ae9b22113770cc69f4
parent193648837c3c0b7750bb1be5845d06f19a7f21fe
parentd3740f299c896999d0e80b62c15960e7ee9efc0c
Merge ... '2f09abb6c6399a0d986a8e19fb17a4bb638c1538'
     and 'db558f5b7717eef3e8d6dd412de064984daa043f'