merge of 356722c1e96526d5963e6080fa85700fc49633d9
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 24 Jul 2005 17:56:54 +0000 (17:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 17:56:54 +0000 (17:56 +0000)
commit30931c232d0aabfd61ab05195d10feddf709243f
tree674700f64440dd11c7fd6377e68c47b9953e6ee8
parentc2f9595d61857b80f9399e774a1a7258ee918c58
parentd08e75eb9ccfbc6ec3517f7b89e85c6ffbf7e2a6
merge of 356722c1e96526d5963e6080fa85700fc49633d9
     and 7207f6f24d4228e24dd9213ba0ef3aeaf2f5fd83