merge of '08302dde2b0020a01fd78d658d7aa2d736941c62'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 27 Jan 2008 14:00:10 +0000 (14:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 27 Jan 2008 14:00:10 +0000 (14:00 +0000)
     and 'f82b7629fd983d380c1a4abf1ae7928c3b40216a'


Trivial merge