merge of '8b1a632406dfecdea03fc49aa79c4b9d50dc01a4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Oct 2008 20:43:27 +0000 (20:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Oct 2008 20:43:27 +0000 (20:43 +0000)
     and 'e416ea72c2f2707b8504ff1726a42c1b183121dd'


Trivial merge