merge of '81566ccb8400689db54be19c2d4bbb9bcab8a73b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 20:03:28 +0000 (20:03 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 20:03:28 +0000 (20:03 +0000)
     and 'c386b75d3046ae9a229198121bffd56b36b626c6'


Trivial merge