merge of '3ce85c1dcecf73ba2a1d581d8377cbd3430f0290'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 Jan 2007 22:54:02 +0000 (22:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 Jan 2007 22:54:02 +0000 (22:54 +0000)
     and '51d3ccc90d12c3d89f4ee6025a9bd98c7d77795c'


Trivial merge