merge of 'bba23ca6193d5f2eb30e36c878736204560ca83d'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 15 Sep 2007 23:22:36 +0000 (23:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 15 Sep 2007 23:22:36 +0000 (23:22 +0000)
commitf7693f87483b98d5db193b12021f79856a0a6641
tree2785ebf4d967df5ecb65a2d4fda1ada1c48ecd95
parent76cba2b1b9c4917b25f9c34b5d8c42c9ffd00e01
parent34934095ab13f496b8ce203e34a0fd47028206a1
Merge ... 'bba23ca6193d5f2eb30e36c878736204560ca83d'
     and 'd23a37e33429ad715c4689a5170e23c795946d2e'