merge of '09bb66d3fb1db889848916179b819a78e4efde02'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 24 Apr 2007 11:42:20 +0000 (11:42 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 24 Apr 2007 11:42:20 +0000 (11:42 +0000)
     and '67a5fc719e8eed7c1ae79482dc4aac1049cd7140'


Trivial merge