merge of 'c171a0d7bd9dab6cbbf1d894d770fab51475bd07'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 13 Jan 2008 13:36:18 +0000 (13:36 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 13 Jan 2008 13:36:18 +0000 (13:36 +0000)
commitd78f19cd9f51f7ad51a82e65c98c8465f6f5c876
tree5a99d1fd1d46deb4a3b9d1e81cfa867add7b9091
parentbf4916c70f0015463065d0cb34230c2443a3cb92
parent47da305a56ff57bbe34929683672bd5291ab30f2
Merge ... 'c171a0d7bd9dab6cbbf1d894d770fab51475bd07'
     and 'd6039fc8233d21dd9be5522f8986b26912e70b0e'