merge of '9ac27641c9c3a76dca545c31690c7f5780076ff7'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 17 Dec 2006 12:17:01 +0000 (12:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 17 Dec 2006 12:17:01 +0000 (12:17 +0000)
     and 'e6282b8a6c27894ff62776a8cd275d5f0a9a0efd'


Trivial merge