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)
     and 'a7b2cadee4c339e10f0b4d60cef9158657dfc2a2'


Trivial merge