merge of '087b0df65ca7c599195ebde65cf5ade5f06e479f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Oct 2008 09:23:22 +0000 (09:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Oct 2008 09:23:22 +0000 (09:23 +0000)
     and 'e9f5d882ea155bc40b4e8e04f619a71012db141e'


Trivial merge