merge of 'abbb903ea194f8d475fcad5e363b216934593391'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Feb 2008 11:43:36 +0000 (11:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Feb 2008 11:43:36 +0000 (11:43 +0000)
     and 'c17e9e2bf2155f7bde8313938198e7409fead8f9'


Trivial merge