merge of '85a2f16fc0d263698947f31a1f50694c14d86e70'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 11 Apr 2008 17:44:44 +0000 (17:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 11 Apr 2008 17:44:44 +0000 (17:44 +0000)
commit9964a54c69bd8fd89751dcafbeaabd7df87dbb44
tree24af7d7c4c612a6a8235e1707f7997b6fbe1492f
parent78152a4ce7c7a80ead65c580bfebfa983602bf1e
parentcbdeb4279489036aeeb031a005140ea7831a4d86
Merge ... '85a2f16fc0d263698947f31a1f50694c14d86e70'
     and 'ac0792f17a9fb0d1306d68b84abb3370a80d4bce'