merge of '3ce85c1dcecf73ba2a1d581d8377cbd3430f0290'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 Jan 2007 22:54:02 +0000 (22:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 Jan 2007 22:54:02 +0000 (22:54 +0000)
commit08e4bd854fe98f0e7f59dc241b50a9275780d7b4
treecc362d1bd63e94e1ce9bdcb88aa8b6969e49186e
parent8fee073fa60589c10155b065d6eae3b203895f42
parent6962054f94e45973258d280167c5dc15cfea1d67
Merge ... '3ce85c1dcecf73ba2a1d581d8377cbd3430f0290'
     and '51d3ccc90d12c3d89f4ee6025a9bd98c7d77795c'