merge of '3066a734f02184d60ed86216f8356de08970aefe'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 4 Apr 2007 11:56:09 +0000 (11:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 4 Apr 2007 11:56:09 +0000 (11:56 +0000)
commit2c88fd5a4d4805d092618e4721d915a1578a6cdf
treeac920f6a3b5c0094dae5b1a5fdf3861a8ff8efaa
parent81a723e863c98fd2a3529da88c4eb731450263c9
parentce2d4eb176af03e8a8c75f0294fed6a400545720
Merge ... '3066a734f02184d60ed86216f8356de08970aefe'
     and '89b237f2bb444f1ebbbd18dfa8c97fadd289e6ca'