merge of '4287770ea855fb20a7ff1b944f48982f4aab48c9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Aug 2007 13:01:11 +0000 (13:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Aug 2007 13:01:11 +0000 (13:01 +0000)
     and 'fd012d756d6df4946900321f427519708a15e866'


Trivial merge