merge of 'a0498b1070ee87d8aa57c6ebb87c6bb5b8b8a2f8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Dec 2007 12:01:12 +0000 (12:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Dec 2007 12:01:12 +0000 (12:01 +0000)
     and 'baf350cbcd556f305c1dc7b1d828499cad03979a'


Trivial merge