merge of '2e9358fe57665ae0d14365c94a62792b10e1b578'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 9 Oct 2008 08:00:09 +0000 (08:00 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 9 Oct 2008 08:00:09 +0000 (08:00 +0000)
commit7d4c6706e6bac462524f736010eb11fa0729e463
tree5c3cf90e5c2f4b1d5dd313d7523ca019e847dc27
parent26b33763ab066b8ddd656def6850de83a5c16498
parent355d05a507306d7e18e86fac778e0aaa7f0208d5
Merge ... '2e9358fe57665ae0d14365c94a62792b10e1b578'
     and 'b926346694764187095a5101a505ba5ad9128a78'