merge of 'b25e19744697afbbde21b5770c7d4f474f5c201b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Aug 2007 14:58:09 +0000 (14:58 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Aug 2007 14:58:09 +0000 (14:58 +0000)
     and 'fee382780bcf6b27faf2e00fc0272280e1e9d147'


Trivial merge