merge of '16ebba393f07fe129f76b1b807da9bb04a997d5b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Apr 2007 15:56:40 +0000 (15:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Apr 2007 15:56:40 +0000 (15:56 +0000)
     and '31cd36b1d92e29148911faa9dd34d6873d0a09b2'


Trivial merge