merge of '53ed84a346013a17d2e419b516e0718f0a5ea922'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 2 Aug 2008 11:27:01 +0000 (11:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 2 Aug 2008 11:27:01 +0000 (11:27 +0000)
commitc9c5a3c4b5e127d8105913383eb47b0787cd2d70
tree94b6e22b5fc54a149cf3dbde694cbea75b523b17
parentab1473a0c5923e5c9bd47141a1470d253635fd28
parent90ea3fc23aeffd9a41363fe848b5cb6b8f66d830
Merge ... '53ed84a346013a17d2e419b516e0718f0a5ea922'
     and 'b53a69990c9003e5c1457b56d66b6f431cdb303d'