merge of 'a5c19d4ba5af31a37ae28ae591b4bd7d7623fea3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Mar 2008 17:10:34 +0000 (17:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Mar 2008 17:10:34 +0000 (17:10 +0000)
     and 'c19420734c433c83fc565d689f173063b1294fca'


Trivial merge