merge of '3d05aaf0d53086b42c0aeaa306814e38a106fa9a'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Apr 2008 12:07:38 +0000 (12:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Apr 2008 12:07:38 +0000 (12:07 +0000)
commitf77305366a560bd673633ee926ab20bfb3eceb91
treecd57893410864b052d9fc1e01beee880c666b839
parent73ee755d53ec9ecb8f959cdc039bf515da193aa6
parent0a53b4ebb8ae3957a957810ff28568fc49d0c28a
Merge ... '3d05aaf0d53086b42c0aeaa306814e38a106fa9a'
     and '457fd6fde63edf614faf98c2e44cbb46c7703a88'