merge of '054216fcb27d4211cd8948d7407878afe1bbf15c'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 13 Feb 2008 11:15:20 +0000 (11:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 13 Feb 2008 11:15:20 +0000 (11:15 +0000)
commit784e9e1768bfef0341ec13b7d17b32d98dafaef3
tree42aeafee932d81641e82de922bcdc71b66e9f5b8
parent403333e2d7c0ff87a0a449d7f2d014d941a20d8a
parent32e690935379493f478d1b7a1cd43fce486083da
Merge ... '054216fcb27d4211cd8948d7407878afe1bbf15c'
     and 'f26d3059129388297f1542283ce17d100f8c8acc'