merge of '2499650fe5abe59981764422b43f078dffad390c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Oct 2006 17:29:34 +0000 (17:29 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Oct 2006 17:29:34 +0000 (17:29 +0000)
     and '8743eceb5ddbcadab07d007f99e5dfb34706dd69'


Trivial merge