merge of '484354fc7d908c35f064448e992d669099255726'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 8 Aug 2007 07:58:38 +0000 (07:58 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 8 Aug 2007 07:58:38 +0000 (07:58 +0000)
     and 'f048a9bae79ea733471cb26e128894d77a0d80d6'


Trivial merge