merge of '324c9ae28ad0981fb0295081bc51f62d2b0333ab'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 18 Jan 2008 00:51:26 +0000 (00:51 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 18 Jan 2008 00:51:26 +0000 (00:51 +0000)
commitc2906680781aaebafa1a72afa8be1d941bea847a
tree7b80684d81926e6aafd4a9de900c5d05837faa2b
parent5e7715dbbd5785f528181cf4cf3f92adf19c9073
parent5a47ec1835998c7c02a8397a043a83e7fc010096
Merge ... '324c9ae28ad0981fb0295081bc51f62d2b0333ab'
     and '6fdc0cb19db57ac2a4d88dec24b554f7b34c593d'