merge of '35aebfd326db9a760b6780522db0fec6ba37781e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 14:02:27 +0000 (14:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 14:02:27 +0000 (14:02 +0000)
commit0c9b33dd399e32843b4b8cd412eaf1bc990b63ec
tree18fbcd27e4fa3a140dfa3fa13b0a79c2e5af7d75
parentdc2b518a1cc4993ca22f5b78f26217915a5ac726
parent0555285bb8cb4ce6af411f53813f5f8707e61420
Merge ... '35aebfd326db9a760b6780522db0fec6ba37781e'
     and '5a665541f42d3268c0c49b55db2235a9f910a7c3'