merge of '86dacb8c8e579fd5d42ab61a0c0f344bcf74146d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 May 2008 21:52:39 +0000 (21:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 May 2008 21:52:39 +0000 (21:52 +0000)
     and 'd4a97f257158aba4fde91347580030110ef215bf'


Trivial merge