merge of '2cede492dcacf2a0da5e0cdd419d41a41086b31d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 10:07:50 +0000 (10:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 10:07:50 +0000 (10:07 +0000)
     and 'caed22d9772a0d7a62f8adfe699c9a254859aae1'


Trivial merge