merge of 'a6d2d41d484ef7827260add2c94d270077592a01'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 30 Jan 2008 02:00:47 +0000 (02:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 30 Jan 2008 02:00:47 +0000 (02:00 +0000)
     and 'b62c974ed7610d6eddbf8a25f2e495976892166e'


Trivial merge