merge of '26f1976aebe86c41d96f819481534c07971f4cfe'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 09:19:37 +0000 (09:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 09:19:37 +0000 (09:19 +0000)
commit28c9719d37d58902f1a18b409367af8a49dff81f
tree88252a87fe729bf67c0d872f91c18cfe77296ce8
parent3eeff5ac9faefa1b57c0a697fab3e58209de1af5
parentec5f95f1eeeab7fa77450d7e9fc8b2629a0f99ea
Merge ... '26f1976aebe86c41d96f819481534c07971f4cfe'
     and '46607c54b809e03372f1d5b8cdebbf77f4ffcd02'