merge of '804173890b0c2381f9e13e27fce36c3396184943'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Feb 2007 10:35:47 +0000 (10:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Feb 2007 10:35:47 +0000 (10:35 +0000)
commit509c0496619a6f1583b1d0c380876ad618d453b2
tree104a5c8347af3bc65c364df619489cdf3d339175
parent4b905fee4e7d3ff9148d4716de92c9c3749fa17a
parenta16af27bc459438516b9c25ae55ec91d0f2cef03
Merge ... '804173890b0c2381f9e13e27fce36c3396184943'
     and '83e041bc8cc5227a7a45dd6a81c52b97ebcb893d'