merge of '8f6b66511e35bbf7f98fd72d6d67545037684189'
authorKoen Kooi <koen@openembedded.org>
Wed, 28 Feb 2007 19:15:56 +0000 (19:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 28 Feb 2007 19:15:56 +0000 (19:15 +0000)
commit17ea06b9a7c10204e2042e6bd7784983e5df96ed
tree9f0f7734035d62260485b08b8cf2229bb89fe31f
parent71c77e8e02dba9a9cda8dbd5e1f16115fe823d40
parent53c4697821820b1b2bbdbb244c8c6202cb7dd4a7
Merge ... '8f6b66511e35bbf7f98fd72d6d67545037684189'
     and 'ff5998e440b2ce8a6f42769e187a556120142af8'