merge of '2f056216a3cb2fc336cb26d0b043d22913f23616'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Dec 2007 19:03:15 +0000 (19:03 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Dec 2007 19:03:15 +0000 (19:03 +0000)
     and '9fc11ccdee4cd06908074985765cc44cf143e5ae'


Trivial merge