merge of '244286eadcc7cfd8932af0a70fb3705f269670d4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Sep 2008 14:13:19 +0000 (14:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Sep 2008 14:13:19 +0000 (14:13 +0000)
     and 'a4756265268a114b43a67457632e11ecf67f7b8a'


Trivial merge