merge of '0e7d709ae536ea44f5cea432f11a470b4b8508cc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 17:47:52 +0000 (17:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 17:47:52 +0000 (17:47 +0000)
     and '9cc1cd6d050938f685ff391b4065f8961f8304a8'


Trivial merge