merge of '1be7f2bf094775877851ff25210a555a3b7ab659'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Aug 2007 13:12:34 +0000 (13:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Aug 2007 13:12:34 +0000 (13:12 +0000)
     and '913e5ff8efdd2d62c384775744e3e776ee4d9255'


Trivial merge