merge of '6c9b3832ef2260eb1b3a74e74b1d73166ab79d89'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jun 2008 11:41:30 +0000 (11:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jun 2008 11:41:30 +0000 (11:41 +0000)
     and 'f275c97e2c93f0e846205b213e997b28ed0b148e'


Trivial merge