merge of '21b14c16cbba51690f09ac5d668340eec0d923ef'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Feb 2008 14:45:50 +0000 (14:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Feb 2008 14:45:50 +0000 (14:45 +0000)
     and '2295ef5b7a6917972deadcbabf09fec81a977300'


Trivial merge