merge of '6464776b36220082cce36ce7c89f4d34b62895c8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 23 Oct 2007 14:01:59 +0000 (14:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 23 Oct 2007 14:01:59 +0000 (14:01 +0000)
     and '7f726014d804dac37f882d802eea690ed0c00cee'


Trivial merge