merge of '1877cd2e9cf302d7d582ad4ad0947bd3f85e2f46'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jun 2007 18:12:24 +0000 (18:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jun 2007 18:12:24 +0000 (18:12 +0000)
     and 'f3fa67134fa2d552431ce94b3430e6d12f75c164'


Trivial merge