merge of '5825bf6c4a28f3d0e119e70c98a835c4c371fd59'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Aug 2007 19:27:51 +0000 (19:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Aug 2007 19:27:51 +0000 (19:27 +0000)
commit53c20a77542d9dd39cbecb6aeeb0144bc3ef49fd
tree6c05e547d255570558e28002b0a86fd271cd84cc
parenta667b8e4751d7b03aaa8e35128fcd29a0d24bf1b
parentedd0a688453306202e3faa32415a764ce65a07aa
Merge ... '5825bf6c4a28f3d0e119e70c98a835c4c371fd59'
     and '9533e255d05ed5eb30dca07a71647e870fe55952'