merge of '3cb2978c67d7c62746b9e01b6002b3798f3418e1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Aug 2008 18:43:10 +0000 (18:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Aug 2008 18:43:10 +0000 (18:43 +0000)
     and '81a0838330d2a072edda6c27b5e8c63f40172553'


Trivial merge