merge of '0af83053cd30ecb7da6ef9c1ff0309caecfe1cbf'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 15 Jun 2007 16:13:21 +0000 (16:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 15 Jun 2007 16:13:21 +0000 (16:13 +0000)
commitf08a546c28e5fdc9cdf008131400aa87460086f3
treeeca64bcb8490fe3cedc166f0cff4e742b404c0f5
parentd89786fd1a9b6b13a658daaeedbe2a7700adb619
parentec072e5e186649cc4aedcf16d4ca6469489b802d
Merge ... '0af83053cd30ecb7da6ef9c1ff0309caecfe1cbf'
     and '13d4cd86cb7a8b154e1c94e78f516bb378d335e4'