merge of '8f24f687fb1ef557bf1f1a9e66188d67dde2ea47'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Sep 2007 15:44:58 +0000 (15:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 10 Sep 2007 15:44:58 +0000 (15:44 +0000)
commit496383e73baaaeae20a3e8c21785e9ef66182899
tree05a34001a4ca8d33b79bc5d47ba74100ddf0a8fb
parent191ea8a90af26ee5c0b3c07ad7a2fb28d179cc84
parent1e807f3e9d554d0f8db7f240a1a7a42420f8571e
Merge ... '8f24f687fb1ef557bf1f1a9e66188d67dde2ea47'
     and 'bc1bceb6bfab051d162269a77df02ea351b62358'