merge of 'ccec70abe8a98a77de4b5435a375269cdd6a1879'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 8 Nov 2007 08:53:43 +0000 (08:53 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 8 Nov 2007 08:53:43 +0000 (08:53 +0000)
     and 'cf6acfd742dff1aeba853a7c85797150c678b88a'


Trivial merge