merge of '2cd7eb1d99944ff730eef92a2d7c01e695a59c04'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Mar 2008 16:29:03 +0000 (16:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Mar 2008 16:29:03 +0000 (16:29 +0000)
     and 'fe8b28a7f3024d34b8b9f58aa0fd46de16f7d5ce'


Trivial merge