merge of '390299321610f6481d96301ddfd5203940dda8a1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 10:43:22 +0000 (10:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 10:43:22 +0000 (10:43 +0000)
     and '5c1f800d5a3c66b86677c20801619331b7bc3b4c'


Trivial merge