merge of 'e523e8071d3fe835cfd277ef7adf62c2822468c2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Dec 2007 12:36:16 +0000 (12:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Dec 2007 12:36:16 +0000 (12:36 +0000)
     and 'fd336c878a7a068ed14755cf0c44b0a8d70747ac'


Trivial merge