merge of '64064cb2195e13dcea4cf2698037a9183688cd68'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 1 Jul 2008 22:12:23 +0000 (22:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 1 Jul 2008 22:12:23 +0000 (22:12 +0000)
commit952987d5a7343432e559f231e3b07bbfdd6e0c05
tree21a6b8eabfcac8bd26128f08a229ec6f7a1f8b0c
parent6d002a2a1fdb9442476e19813b69ecc273a52027
parent00b4052c0de0d3fd4df2e1fd59b0c98418254a4c
Merge ... '64064cb2195e13dcea4cf2698037a9183688cd68'
     and 'dab6b9ac9cf3985b3daa6239feb3e7f12acdd0f9'