merge of '81bbe6194f50dea1d1a9838b702680d8b353e689'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 09:37:39 +0000 (09:37 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 09:37:39 +0000 (09:37 +0000)
     and '86d064241f76c59a2663d25f57ee15ef950bee4b'


Trivial merge