merge of '23370e87858b05ea1295304df746770cdb584233'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 3 Oct 2008 09:04:25 +0000 (09:04 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 3 Oct 2008 09:04:25 +0000 (09:04 +0000)
commit1c61f309621cb99f138a9d41e5aeb9a5395e7fed
tree5a96efaeac591fa18a295b9327b74716d2f9db25
parente36d903760a90389bbc46a89fdf5556c38f4966d
parenta34da38577711adcb42a0972ef7d2468cf4e1586
Merge ... '23370e87858b05ea1295304df746770cdb584233'
     and '2c4fce4a2279b81964f4d6df1eb7ec66a8bd6796'