merge of '2e363cde1e696e4fd40b45167cf73e5a7dd0109c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 23 Dec 2007 19:47:06 +0000 (19:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 23 Dec 2007 19:47:06 +0000 (19:47 +0000)
     and '7c0754d01145df6906c2cfc824da2da420a2fe22'


Trivial merge