merge of '2d557ebdb5406e5d0958992ae889acbc4822ae7c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 12:44:04 +0000 (12:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 12:44:04 +0000 (12:44 +0000)
     and 'fa6e511a020ccdfb4a80eef18808ef4d1a07e3c9'


Trivial merge