merge of '506e7ee5f030358bf855b41fcb531ab4c662fffe'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Oct 2007 20:05:16 +0000 (20:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Oct 2007 20:05:16 +0000 (20:05 +0000)
     and '7b3eb3f553b8888f88b87b06f87fe00039a43031'


Trivial merge