merge of 'a1ae39784d60dda6b344012a273c0a4f2a339a97'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 16 Aug 2008 16:19:55 +0000 (16:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 16 Aug 2008 16:19:55 +0000 (16:19 +0000)
commit97f991702952f288dfbb34fee41b56799c654e31
tree30fe596b9a4d8476b05ef3087bf1721cdfd676bb
parentacb89bac6cf892f46ab1665c923a51afafffc768
parenta64a639378fb0e511d30f3f8b29ce3df9eb3e709
Merge ... 'a1ae39784d60dda6b344012a273c0a4f2a339a97'
     and 'e5687f708388bd5700f6433bd38eecc7e0f1ebd1'