merge of 'e98511381d7d86ad5707536e0d5007537577ee60'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 11:22:37 +0000 (11:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 11:22:37 +0000 (11:22 +0000)
     and 'fe4756219cdb2d28a29de9a90983c119f541209a'


Trivial merge