merge of '1505fef26a6cdc6bec6d7d7a81b02146504bb790'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Apr 2008 12:35:27 +0000 (12:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Apr 2008 12:35:27 +0000 (12:35 +0000)
     and 'feea3227e23d70e02158cb7ee3b896e6e4d28fe3'


Trivial merge