merge of 'a1b53f4890a543077cd9692d6f36d55601cf5cba'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 11 Apr 2008 10:17:01 +0000 (10:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 11 Apr 2008 10:17:01 +0000 (10:17 +0000)
commit8f18958d24640e545bedac5f4d6e30b6eef27134
tree6194277cb7f35be2916961a88a80fd102cfe0e43
parent153b800d9e2bd0c7475492a3ed8accf9b00b3bc9
parent3cc4bf7d713624971ac207b1d8b087dc8c6405a1
Merge ... 'a1b53f4890a543077cd9692d6f36d55601cf5cba'
     and 'e7f793242547302eb26367c08896596376eba484'