merge of 'cc5e07dd7b07fafb652332925795d57a51e7d58c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 16:02:47 +0000 (16:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 16:02:47 +0000 (16:02 +0000)
     and 'f90c9d0f1288b060a8c57b9eb3c70e06353fe93a'


Trivial merge