merge of 006bbeb2da2090839ec05cdbd7cd825c900ac850
authorKoen Kooi <koen@openembedded.org>
Tue, 28 Feb 2006 17:28:37 +0000 (17:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 28 Feb 2006 17:28:37 +0000 (17:28 +0000)
commit83105ad9e6045639a7c4a4a95f78dd8685588baf
tree3b7a5d87e6f9ade67dca3f300beb600945a2c834
parentb15cadafceaf782b2b8ed2ff55a8ed47b2ade1c8
parent4ae975af982f97abf3a8a3b5a6bcb11f27ffab8e
merge of 006bbeb2da2090839ec05cdbd7cd825c900ac850
     and f144cf893311c20cf43f68a99c982431aa75861f