merge of '0c72fca9e0c0a27bd39068df21078215a4362b1c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 22:13:10 +0000 (22:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 22:13:10 +0000 (22:13 +0000)
     and 'df88361619c93df2c6573ec7b6bdf56f0e4cda94'


Trivial merge