merge of 6c734c3ddb93620eab20893a98b5c09f26ba239c
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 10 Jan 2006 01:17:15 +0000 (01:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 01:17:15 +0000 (01:17 +0000)
commitcb493a3d185292050c053607613bb38d104bf2a1
tree352b5d93f5f5537f8113ebc0a8b8c24398135eaa
parent90d6ad3cbb6d66b73c744a12d4bcf11929f09896
parentbe954a5547b18eb5f78c22fa36000eab2daa3655
merge of 6c734c3ddb93620eab20893a98b5c09f26ba239c
     and 87835ab55e4ec8244d79c60c5c32378d0371336b