merge of 'af851f4509aae0ba4c539361ee5e09b515f331f8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jul 2008 12:52:11 +0000 (12:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jul 2008 12:52:11 +0000 (12:52 +0000)
     and 'b43a21b343fe9c1dc9cb8c83379234f15bc53f72'


Trivial merge