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)
commit4e0950a0db376b2ffaedbef84866795012c3036d
tree5b83ebf7965d3c6724fcede2ac9042f4d62b5c7b
parent5accee758316d43e8235553ec96a8386e98bb936
parentbab779fd1cd247d2cecc0a4265d034c0e01f1d30
Merge ... '3d37ffd4df7a43763fa8642112a238989e1e85ae'
     and '5eed113f8f560df1854b52e85453d3987ec071eb'