merge of '5c7cb8a0cf72b57be73ae08b5e625eecf68c3969'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Jun 2007 13:21:29 +0000 (13:21 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Jun 2007 13:21:29 +0000 (13:21 +0000)
     and '97b9d760b9a9eeeb209e06acb82d7303aec3bf7b'


Trivial merge