merge of '3eeee83b495171a3097820abe214e3b9259e3c69'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 28 Aug 2007 13:52:00 +0000 (13:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 28 Aug 2007 13:52:00 +0000 (13:52 +0000)
     and 'b2b1b0bca3e6611843f9d75414f27a3b4f74a64b'


Trivial merge