merge of '5dac0e1b5f9f45a441a326fa1473ba5075ccaa72'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:14:48 +0000 (11:14 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:14:48 +0000 (11:14 +0000)
     and 'a3e33233c551ea93b6c29d959a2a0f5d905b97e5'


Trivial merge