merge of '0c29b5c42b77169131d341373bedf1d5faf4af83'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Mar 2007 19:06:39 +0000 (19:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Mar 2007 19:06:39 +0000 (19:06 +0000)
     and 'b6e208df4ac3f681a9a18f6b4cdaac3850de571c'


Trivial merge