merge of 0b2d2dab01a71f8522d03a6b9052a532752f6252
authorHolger Freyther <zecke@selfish.org>
Sun, 14 Aug 2005 14:49:49 +0000 (14:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 14:49:49 +0000 (14:49 +0000)
commitf3ead211477be5319bbb8cb5a983e6ec68dd2a23
treefba21eac5436d0353657952334b940efa1481ca4
parentd1ce1ec2f684aa2bee1e1d90bdf7d1a315b7bfb1
parentd51711eeefc3aa5f6114421b2137a1cd06ce75e0
merge of 0b2d2dab01a71f8522d03a6b9052a532752f6252
     and 6b49a965af76925e57f0c413d3dcdd60c0170fa4