merge of '162bf228da944fcdae3d12cc94a424a78acc3dd1'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 16:22:38 +0000 (16:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 16:22:38 +0000 (16:22 +0000)
commitf3352958d5c5bdb4da60ac99a1bd61008e6141ad
tree72b01e7d894fa568d99e9633a5806fc90b5f7b77
parent3ff424897ffa847b198072c53bf40ec06961a8ef
parent6e705387fcfdb7b76d9dd7d1a25c9a60bd65c8d0
Merge ... '162bf228da944fcdae3d12cc94a424a78acc3dd1'
     and 'f121ff59ddc88918fdbf4ca28a76373ee9ac4fb6'