merge of '1adf7728881d50d6f0c0d604d00e706cf049e597'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 22 Aug 2007 13:48:16 +0000 (13:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 22 Aug 2007 13:48:16 +0000 (13:48 +0000)
commit26f417680076d5ecdb8d732273dd5268222aaf40
tree85b416c36641ac1fd0e38ddd921a84bf824f0619
parent1f3169385e6227a1a327510cc4fb3cc441a4b566
parent1ad1eead848e02c6eea27c34e869126d81cb6355
Merge ... '1adf7728881d50d6f0c0d604d00e706cf049e597'
     and 'c3529caf8553e1815756aba75bbc52d0f342e609'