merge of 'be935cd20984b601cff3bf92e55199ca58f342d4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 15:07:23 +0000 (15:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 15:07:23 +0000 (15:07 +0000)
     and 'fffc9d2a17f28ac531659b76c1a1e0e37d2e7d17'


Trivial merge