merge of '09b95864e7ee73a1de1bc720bb60f856f66e46d5'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 23 Oct 2006 15:53:09 +0000 (15:53 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 23 Oct 2006 15:53:09 +0000 (15:53 +0000)
     and 'f6cde9cce57b9a6d7caf712e9a7ffdf9722f0c17'


Trivial merge