merge of '64b4c8fe4237a26afc063affc6aa1633bea9dba0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 6 Feb 2007 14:12:48 +0000 (14:12 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 6 Feb 2007 14:12:48 +0000 (14:12 +0000)
     and 'a4aac9c855570e5ac7a83f7c0536235ba0bbdcaa'


Trivial merge