merge of '135f1243bae7b8d2761f12a5ee4792c0fdd61cd7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Feb 2008 23:33:58 +0000 (23:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Feb 2008 23:33:58 +0000 (23:33 +0000)
     and '4eb5b005a1da43a766a4d6f77af48d3ba0a994a4'


Trivial merge