merge of '156573f21daba762fc9410e3cbeb2c3e7fdebc21'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 22:10:32 +0000 (22:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 22:10:32 +0000 (22:10 +0000)
commit58b143101f0b6d2a3d486c9d3e5f33960930de09
tree6a16bb0b55da446721b59f35ccc8af44f8407427
parent785f03cc21bf58582fe916261ce6b998a3534951
parentcd0ed778d5163abc5052c24f3eec60b79ae21945
Merge ... '156573f21daba762fc9410e3cbeb2c3e7fdebc21'
     and '9defb4ea3b59c767618beab8ee9a5441c6ba4797'