merge of '1cdc12c3862be0a347484d50284adc22bea0c4b4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 11:29:51 +0000 (11:29 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 11:29:51 +0000 (11:29 +0000)
     and 'dd686600ef516db9cad8d6454476424eb47cf9b5'


Trivial merge