merge of '191f327932f99e02f2e0bd98ff435cfd9b439c23'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Jan 2007 13:27:58 +0000 (13:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Jan 2007 13:27:58 +0000 (13:27 +0000)
commit81ee85ebd08f54a51f746e23ef88f8c59d074470
treed83fb250e159c9bdb4da8ee84803475a25f92b81
parent812d5db2565bef981aec14841151a6d18b43d015
parent328ccfbac39fa6fc98be06e27b9abfd7372c6179
Merge ... '191f327932f99e02f2e0bd98ff435cfd9b439c23'
     and '3c96b014ef2dbcdb79faf2c1b5dbbc4d0d2d7660'