merge of '1f9075ae3f232cc2e5b6024d908c97361fa4cd82'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 15 Jan 2008 15:45:23 +0000 (15:45 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 15 Jan 2008 15:45:23 +0000 (15:45 +0000)
commit96bfc4d951c2740e12630acbb52bb9d05acba695
treee19c5cc21ae39112aab91288eb88bcca705f5f21
parent32e27134d0319348e56faf2db082e40cc89d502c
parent575d1e9c93159b1bc54fc4c7e82673048883fb85
Merge ... '1f9075ae3f232cc2e5b6024d908c97361fa4cd82'
     and '8996304d45d20965f75c306e6317a0238f26fbf7'