merge of b415ab8f4974d9175f84b48d1cb18563161d8da7
authorPeter Urbanec <toppy@urbanec.net>
Sun, 28 Aug 2005 14:25:44 +0000 (14:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 28 Aug 2005 14:25:44 +0000 (14:25 +0000)
commit1207e1c0ea604485bc87179df350b697bac56b59
tree0d2f4a9aaea78fa2723925547557f79c942aa11e
parent8a6226d5e6680a73677457c31ad5fa64f725c5ca
parent7f4a30d2f320d5b4253ec08abd2d4421a31ffb3b
merge of b415ab8f4974d9175f84b48d1cb18563161d8da7
     and e98e2ade5d50176ea17a627451ff8d233ac9a4ef