merge of 'a3db419309941fac383949b8b58b338cc5742f39'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:02:28 +0000 (19:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:02:28 +0000 (19:02 +0000)
     and 'a7d0911cc51bd1eb437c71feab04198858ad16b8'


Trivial merge