merge of '603b2d0c7e4ad80e5779bd3bbdb822331cc0ea2b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 00:34:07 +0000 (00:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 00:34:07 +0000 (00:34 +0000)
     and '6ab53da82d157971966f5a17d0c29d54df22cac9'


Trivial merge