merge of 067348788424405023bc8971f401fd647ff123d2
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 29 Nov 2005 17:53:31 +0000 (17:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 29 Nov 2005 17:53:31 +0000 (17:53 +0000)
commit8700a39faa54abf5b564db7467a6b8d31ffca988
tree66b5eaf3e9aa4dc1dd54a00ed806c52f80220856
parente95e5c53b37690efacf380f26a76e8749d55ab6e
parentea93a0ba65c5937ea99a7307d27121d1015d207d
merge of 067348788424405023bc8971f401fd647ff123d2
     and 7436e5bd502644f73a27f1d58324cbe48bccb511