merge of '43753505f023f7853afdd0f497c28ef65c4b2509'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 24 Jan 2008 19:40:17 +0000 (19:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 24 Jan 2008 19:40:17 +0000 (19:40 +0000)
commit8bd2d93c229bfb504384827e38be3cffa65e7ec8
treea9d7ca42f0671918ac695c674dd8c43c6712515f
parent2d9c184c9d3b28efdfdbd0c827d6b1fda0d507a7
parent3f3adf80310d6181293f1c11f600022633367cd5
Merge ... '43753505f023f7853afdd0f497c28ef65c4b2509'
     and 'a7b2cadee4c339e10f0b4d60cef9158657dfc2a2'