merge of 'ad5346155c810928977e1056761f7e6de5142de2'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 15:47:35 +0000 (15:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 15:47:35 +0000 (15:47 +0000)
commit0db2c6550228f43ec0c3e1f816355abe4c2d491e
treed5bc08e4eaf086faa9a1bb938de04b2febb6a173
parent0a9a13bbe39c77e4d183d4dbafe24484191b4620
parent10cfda3e6f4e0f07b201985ba58c08e8e0d7c64e
Merge ... 'ad5346155c810928977e1056761f7e6de5142de2'
     and 'feafcb12f6ebb596d3500f718255df081a8c8f5a'