merge of '9bc9e7c2997572e45f3e497532122978988a6639'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 14:44:41 +0000 (14:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 14:44:41 +0000 (14:44 +0000)
     and 'b4e23a53f733c0bb2b846ccec15841140e0290df'


Trivial merge