merge of 3abff1bf232495168a2b305065a4da2954e5a9db
authorKoen Kooi <koen@openembedded.org>
Mon, 20 Feb 2006 12:51:03 +0000 (12:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 12:51:03 +0000 (12:51 +0000)
commit7627229878da162e51c3a3b584124ac8c5603b86
tree18501aaf785a63526ef1dc98c9f12231baf43657
parentec5f7713d33ef66032e6f7d2eb1c8c2cf4fcbc40
parent51b6251279b4e22338d402d3917c849435468e4b
merge of 3abff1bf232495168a2b305065a4da2954e5a9db
     and 7130132bd2ec2d091cb9f34a849614afc5cca66a