merge of '9e580a678f2605300358d2e2cf2eabb8d6e577b4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 01:10:32 +0000 (01:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 01:10:32 +0000 (01:10 +0000)
commit8ecf6b3ef9a770baebf5e7b14e5970a532f0bfcb
tree84777f4a662f0b569759aa2bbbcafb1070ef0010
parent6f80ec4651a837d6fecb5092fb6fd458bd7457b8
parent5c3a71d6bd2a212d89f2f5c7a7c08d16fa3b7511
Merge ... '9e580a678f2605300358d2e2cf2eabb8d6e577b4'
     and 'ed644d93511a8c52d17ad248a1866e866038da60'