merge of '46ca801f1efcaa636eaa43837f3587c7c90a93ec'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 May 2008 09:10:40 +0000 (09:10 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 May 2008 09:10:40 +0000 (09:10 +0000)
     and 'c4f0fa8168863feb54d1292280f576d79b26222f'


Trivial merge