merge of 'a5ee0a152a133bdeb1576bb7a08fa9f1336e969d'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 12 Apr 2008 22:30:21 +0000 (22:30 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 12 Apr 2008 22:30:21 +0000 (22:30 +0000)
commitcb100bd3e661641cf870b3ffe8e5a9c52ec846b6
tree0618165370e33a103b98e5d56192594aeff9cc58
parentb09e800e8119987a8504a23d808d313a405a9c11
parent133f5b09d22b6e4927f64f070f33b7c34115dbb4
Merge ... 'a5ee0a152a133bdeb1576bb7a08fa9f1336e969d'
     and 'a6bf1374bee35f1cd9cae388f5137b3d0647f2af'