merge of '3802d5aa3022a434a47a62758a780bebfcff5c4d'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 10:40:25 +0000 (10:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 10:40:25 +0000 (10:40 +0000)
commita6aca0c99ea61a1cee31657bef1017d824e24c82
tree4da5c8fba073d5934f93ed26acd60fa0ab5fa0db
parent7721a458d28ab29b41284e229e54a5721f195fc9
parent4b0e5612a5f2dd7576d49e922c72fc5e51c22ae3
Merge ... '3802d5aa3022a434a47a62758a780bebfcff5c4d'
     and 'a7772b5814e2f3ffb39d7d0d87094111a5bf3a45'