merge of '17c778274717898b377338f8552576cb4fd350eb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 28 Feb 2008 11:18:34 +0000 (11:18 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 28 Feb 2008 11:18:34 +0000 (11:18 +0000)
     and '662ae9dafb4c25857c0afa36b3303e10fdd8cea6'


Trivial merge