merge of '8757cea2a30d383fc8b9e31dc7ae714a4df33a64'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 3 Sep 2008 19:22:53 +0000 (19:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 3 Sep 2008 19:22:53 +0000 (19:22 +0000)
commitcdafdc4da4ca1c891d593d2839e024484b0c2468
treefdebee622257cd9ee847f7714492e0817c2d0953
parent819cd56f786f99f645ce43e9882dcc7546c9ff4d
parenteccbdc9395f7b525e77087d13d5ae66f2932098f
Merge ... '8757cea2a30d383fc8b9e31dc7ae714a4df33a64'
     and 'ca29e1912671c0d9322d55bfb15de7d18a7379d6'