merge of '35db89c4b3d1eaa8c0f4b1effd258962748ac7d0'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 7 Mar 2008 12:48:29 +0000 (12:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 7 Mar 2008 12:48:29 +0000 (12:48 +0000)
commit3a4c16c4cf377222ccf8036511d6cbbe493ec27e
treedcdd21a0d3aa61603dabb532c0628e242f87cfba
parentb17bdc4c720c10edf9648c19331f7436cc9df4a6
parent34f3007a55743559d01dafc65bebd95c3c947933
Merge ... '35db89c4b3d1eaa8c0f4b1effd258962748ac7d0'
     and 'e864291685ba1a24984c6960efae35c98c88d0b8'