merge of '0da4c1d1a1201b71b5bf114146f1ce3482bfc846'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Feb 2008 13:46:22 +0000 (13:46 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 21 Feb 2008 13:46:22 +0000 (13:46 +0000)
commitcd2035c98bd1995adf7c3df1b73e5f308357e3e3
tree101faf9c43c8b5e1876faeb2ababe329c16ea7a7
parent5f80772db194135a8817add109762e7e96ee75f2
parentb8d4af8ad68ef847d381259b8e8c25a998a6b88b
Merge ... '0da4c1d1a1201b71b5bf114146f1ce3482bfc846'
     and '917b1c29f7daf7bfd184979a9b4f90fa0f1f8616'