merge of '728b58626c50e060bf71960029afce111427d6a0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 6 Jan 2008 17:42:15 +0000 (17:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 6 Jan 2008 17:42:15 +0000 (17:42 +0000)
     and 'c22898d69793df7ecf7b5bb1e62791c4780023ab'


Trivial merge