merge of 'c7aa26c35b5e6c0ea55ddf1bb868db044a246b50'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Feb 2007 19:12:21 +0000 (19:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Feb 2007 19:12:21 +0000 (19:12 +0000)
     and 'ef57153eaf716faf48fc2d4266beddc4dd7b524a'


Trivial merge