merge of '322ea19f98c9c37886c8eb080fbd9c6a552f7b1d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Apr 2008 19:01:32 +0000 (19:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Apr 2008 19:01:32 +0000 (19:01 +0000)
     and 'bbaee78aa2be4934e6fb2377a1ef53589b7e3b7c'


Trivial merge