merge of 'd7826d9cf7d1f91bfebd799820abbd0ce3128db9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 5 Feb 2008 16:17:16 +0000 (16:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 5 Feb 2008 16:17:16 +0000 (16:17 +0000)
     and 'eceb5780d848ff2a4a8e9d4a2310dfd39eb41b65'


Trivial merge