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)
commit6103cfc590628d7c2c9a52eb1fbffcf64b1983fe
tree673a278b3f65c41109d461dcde106b3ac8bbe13b
parentbe12dba47e8082ecc7094bfe9c0cdbdbe0ce913f
parentbadb9b7c29c71a1dee23d1ed1ed3ade8cb1089f1
merge of 83739874587da7060ea036057cd64ecfc72a9727
     and c42bb6039b75d9d8287274e7947197f78c73cbed