merge of '159abf710e505eb360cea20e22b6f1fa84eb6e4a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jun 2008 10:37:25 +0000 (10:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jun 2008 10:37:25 +0000 (10:37 +0000)
     and '3f37d09caa1458ff05bbfdf2d47ff7dfc82d2f10'


Trivial merge