merge of 'ef57d7f9782540c734ca9342f8a136c7bbeb5074'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jun 2008 11:57:04 +0000 (11:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jun 2008 11:57:04 +0000 (11:57 +0000)
commitf5f80119bd3754a7a9c5b208db11f42e020cb263
tree3a16b1b40b6e5d031a9b12305c1dabf5c8e2e890
parent7e053e1b25a0e71ce01fe7239a7da53f4d99e87f
parenta18c21713f039889f9b94f4f24a8a1988a904d20
Merge ... 'ef57d7f9782540c734ca9342f8a136c7bbeb5074'
     and 'fcaa336068b9697eb2e8236103ae4865056796c1'