merge of '0df5b658b96f939f5d3b63df5415ea1d46d83f25'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jun 2008 18:42:45 +0000 (18:42 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jun 2008 18:42:45 +0000 (18:42 +0000)
commit1c4fbce5fa2e366111b564983ded5631eb7e2f19
tree5dc75b463e95660d80e0138dffa6741bada5688d
parentdff45e71074cbb4e08a48d6b6ffd7a244c5d66e3
parent0c718d3fc5e6e61058811f05f41280ca369941ef
Merge ... '0df5b658b96f939f5d3b63df5415ea1d46d83f25'
     and '31de530bc2ccfc10a0020cfb5eab126481380149'