merge of '7fb19ff722fe0f3e88a9d45230442af71ee72960'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 9 Jul 2008 15:31:44 +0000 (15:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 9 Jul 2008 15:31:44 +0000 (15:31 +0000)
commit65bb1f64b7f7f300ac38c890e2980b95f88ccdde
tree4dc72b073ef6c288cb01bd754d4fbfeab22c3590
parente0a282093003775e8bc2614773e9dc3a9cba4674
parent260b89a668fac43fc00e02dacf51a777feed7f76
Merge ... '7fb19ff722fe0f3e88a9d45230442af71ee72960'
     and 'ae00760854aae829460c79c1907ca952c25f5a02'