merge of 'c8b6f226355d3351327e8b61f52855537a448a23'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 17 Oct 2006 06:44:22 +0000 (06:44 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 17 Oct 2006 06:44:22 +0000 (06:44 +0000)
     and 'ff788cdac5bbfb991ee004911daf4db1b80ff5ce'


Trivial merge