merge of '1371b0ca0c9196fb79d60d8e403105033c23e823'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 05:39:05 +0000 (05:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 05:39:05 +0000 (05:39 +0000)
     and '7fd89d0a8aadce9435062c2d2b53220149205926'


Trivial merge