merge of '674974b81d2da7e7d81070dc38e8b163632c887e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 26 Jun 2007 09:40:27 +0000 (09:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 26 Jun 2007 09:40:27 +0000 (09:40 +0000)
     and '89afd3974ed8a86d2683d1222dcb1c60b2295772'


Trivial merge