merge of '3d37ffd4df7a43763fa8642112a238989e1e85ae'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 3 Aug 2008 23:04:56 +0000 (23:04 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 3 Aug 2008 23:04:56 +0000 (23:04 +0000)
     and '5eed113f8f560df1854b52e85453d3987ec071eb'


Trivial merge