merge of '2160ef6a1176c4f7a49c5f831509721ea75cd35b'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 18 Jan 2008 14:15:39 +0000 (14:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 18 Jan 2008 14:15:39 +0000 (14:15 +0000)
commit7569440e6587054a298f1417447750a3aff0afd9
tree065c237fc46385c933dd193f9132055fb2b795ab
parentae022ff1625bfad50c7f9d81bb6f60732e88f7b9
parent1131d3b31711ce7241de6df9aa6a4e5652929fb0
Merge ... '2160ef6a1176c4f7a49c5f831509721ea75cd35b'
     and '9a37a94626c4cf51ec6e7f7d6995599fb462f838'