merge of '152bd050ede96601db58624788435d4ce651b13c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 May 2008 15:20:04 +0000 (15:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 May 2008 15:20:04 +0000 (15:20 +0000)
     and '2b28a077b8cfb9486d59a3f3a4e44bdb8b90dde9'


Trivial merge