merge of '70bbbf8ce343203b1f290a976647fa71c21b8e15'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Feb 2007 11:01:32 +0000 (11:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Feb 2007 11:01:32 +0000 (11:01 +0000)
commit8ac98dee22a516f221971c051de11681618dbebb
tree15823ac0f2dcbb2784f8be0a7ed03daef0d7bd5e
parent509c0496619a6f1583b1d0c380876ad618d453b2
parent023951cb465a525ab34af79e21810bfddd087eaa
Merge ... '70bbbf8ce343203b1f290a976647fa71c21b8e15'
     and 'b5dacbd65a183748cce04d3a42790cd07da948ed'