merge of '9dc7779dad5b6a6762c08a60de1c3cba24575356'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 16:46:17 +0000 (16:46 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 16:46:17 +0000 (16:46 +0000)
commit6e43272f0388c76449c6b4b04c6e84fada2fe55b
tree6dad131ef9156fc3c5a7ad710443f0ce59b09d51
parentf1cbcd1fe10ec15ffc4ace0e180c35d969058be4
parentf8643cc0c333379bf08920f7a78623189df9c9a4
Merge ... '9dc7779dad5b6a6762c08a60de1c3cba24575356'
     and 'a08c13e1d6c50600fb85844f3940034870cd26ad'