merge of '55e46711dc1a18ac2aab5bf8dd32e86e8a99f02f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Nov 2007 09:25:51 +0000 (09:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Nov 2007 09:25:51 +0000 (09:25 +0000)
     and '7bd7c5bb615e623e265a40e19243ad0504689f97'


Trivial merge