merge of 'b1155dadb6ffc45920e64fbaa89240ba5c7fa0d4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Feb 2007 15:55:56 +0000 (15:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Feb 2007 15:55:56 +0000 (15:55 +0000)
commit2d602230211e28ed96e3858ef15dc06b519ec71e
treeacff44b1e8fd08f834880bb7f0688fb6b0c62180
parent11edc14071068f9b25b7f69fc37db7dcb3142dce
parent628ac3daba03fb2e728da2ee2847d80cace90d8f
Merge ... 'b1155dadb6ffc45920e64fbaa89240ba5c7fa0d4'
     and 'f6878aab9639c583f635cdd6149b4aee8f86cb50'