merge of '470ca3fe64c9411d3a7d992db39d5efbed869839'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 17 Jul 2008 18:07:12 +0000 (18:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 17 Jul 2008 18:07:12 +0000 (18:07 +0000)
commit12f8a39939c28003a39b84713d9a51305511650d
tree2235c3d2a30eac66c0319b7cff55928990c89bbd
parent058132b8be45ac2041a574782b8800c1956e44d3
parentfcbe107913b10643d1ba8ac137de273e12e8854a
Merge ... '470ca3fe64c9411d3a7d992db39d5efbed869839'
     and '912f388483a3e1703ca89d7b2309723fd3407420'