merge of '36dc1826480be70d657adcad4878a3f6f3e9092f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Dec 2007 19:54:49 +0000 (19:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Dec 2007 19:54:49 +0000 (19:54 +0000)
     and 'cab9fe526eef22de96cde31f68aacaa77ce0f9fc'


Trivial merge