merge of 'a69bccd956bd985b8ff6256dd396ae3fca013280'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Feb 2008 14:36:55 +0000 (14:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Feb 2008 14:36:55 +0000 (14:36 +0000)
     and 'c78f27d17fb88b16f530ee47718fbe6d3cde6d6e'


Trivial merge