merge of 4daf34d7b97dde040c825249e39abc6af0abf493
authorRod Whitby <rod@whitby.id.au>
Fri, 13 Jan 2006 20:25:25 +0000 (20:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 20:25:25 +0000 (20:25 +0000)
commitbbf67faea13558e9ad23b6faca2c0745630f8939
tree542bbb85939cf9c81570481dd7b4dd30672ef5dc
parent7787b6514bdfa5328b702be33c1e12c22e4226c9
parent4c0fea3593bf3615b06250162e53832085e78b9d
merge of 4daf34d7b97dde040c825249e39abc6af0abf493
     and 7f6d02bad0d27e0bd6a0d6e493318b5275142389