merge of '89819f9979e4ce42d678a887b2cb1a7daf6b614f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Dec 2006 14:45:44 +0000 (14:45 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Dec 2006 14:45:44 +0000 (14:45 +0000)
     and 'fad26c77ecded8ba097147c4f209e7ba4d5ee19f'


Trivial merge