merge of '10bc51a56352cd32ff5b7b70a1690ba41c538716'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 3 Aug 2007 19:12:42 +0000 (19:12 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 3 Aug 2007 19:12:42 +0000 (19:12 +0000)
commita667b8e4751d7b03aaa8e35128fcd29a0d24bf1b
tree3eba90d488dfa5d8a6b28a4d49408907a5096916
parent7ff90ab0833a22335700d1663d9aa5cdb16895dd
parent3ffb50db8a79b78e4635570dca5c2ef8d815e653
Merge ... '10bc51a56352cd32ff5b7b70a1690ba41c538716'
     and 'a0e7e86db7c5ef00350a27bbe1959df6c1375b2a'