merge of '4c2d3d5326458e250883b741a3c57e93fa3cabdd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 23 Apr 2007 17:17:20 +0000 (17:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 23 Apr 2007 17:17:20 +0000 (17:17 +0000)
     and '792b1b257756e328b12b4d731ec035b6d0c614b9'


Trivial merge