merge of '6d087d0879bebefbb3ecb1d4c7a2918fcc9dbdcd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Mar 2008 11:58:55 +0000 (11:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Mar 2008 11:58:55 +0000 (11:58 +0000)
     and 'a348645b7840d8ac81a18e23718751899dd63120'


Trivial merge