merge of '15632785e576f4fbbf9cdccf18d8aae806bec193'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 4 Aug 2007 20:47:30 +0000 (20:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 4 Aug 2007 20:47:30 +0000 (20:47 +0000)
commit40f235ee23e7ed72a7e28c16dbcb2a1d2d02a6d3
treedd55163ac604cc01acd585be0f04b9f47e9fbc28
parentec05f60b2a11d52a01a4a39c8057f608d7da1c9d
parentcfdf930c72da72af054ccb53e29f63e1174d3679
Merge ... '15632785e576f4fbbf9cdccf18d8aae806bec193'
     and 'dace6576f510b1f3af99d9580e3f0d3d18a773b1'