merge of '048d7a25deec409ecdb2a1dacf3ef6afb4f6359f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Mar 2008 08:43:15 +0000 (08:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Mar 2008 08:43:15 +0000 (08:43 +0000)
     and 'f38f68f6196f02a72030cf539729f671d94c6542'


Trivial merge