merge of '23aaca50b161d66de0dd1f96937010f0ad1f1f54'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:48:49 +0000 (00:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:48:49 +0000 (00:48 +0000)
     and '7dbeb5e383fa2bee20df397e69caddaee824c644'


Trivial merge