merge of 26c7aa9a5e1ee433e5f5ee59307c1840d2e0658e
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 3 Aug 2005 08:25:37 +0000 (08:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 08:25:37 +0000 (08:25 +0000)
commitb67dff65efdea9f5c2ac5ece9e312de3d4480276
treef0a96f039b7104fb5ae671630b967cb9628ce704
parent013f194702c58b4c43cec0e41e4ea1712f2b3e06
parent857f09b4e6cd43262e9068334c80fe5dd328f71b
merge of 26c7aa9a5e1ee433e5f5ee59307c1840d2e0658e
     and ef346e4f39975933d42031cb6e4b7d2b9656e9e7