merge of '0ad35e389f09a922b10c36c96396701c2d57f4b5'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 09:16:15 +0000 (09:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 09:16:15 +0000 (09:16 +0000)
commit1222daaca94183138d2ca953be980e1198622ea0
tree47fa4947f9f943c168abf918b2375708ecde2771
parent9ed9ebf816c2eacdb1dd9733318b51c7c8d6495b
parent76822c8c08c3090902fade2582e0f3e15bde3729
Merge ... '0ad35e389f09a922b10c36c96396701c2d57f4b5'
     and '58ac191dfd6484676031d3af5d00408929e5266e'