merge of 83739874587da7060ea036057cd64ecfc72a9727
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 14 Jan 2006 23:28:35 +0000 (23:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 23:28:35 +0000 (23:28 +0000)
     and c42bb6039b75d9d8287274e7947197f78c73cbed


Trivial merge