merge of 'c91a79a505ff2ecaedb60a24aae9a3a69e481038'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 May 2008 18:21:43 +0000 (18:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 May 2008 18:21:43 +0000 (18:21 +0000)
commit85605efdd977ac2ee8cf665f3e9d47b62650f4c1
tree07ea8019377bd398bc99f5e5c6fbe5e56f6a80a8
parent2faeb82daf7f74b0dda868adc7e4c43640e79982
parent568266de9dfacc7ffd261b17ff6dc5cd625769d6
Merge ... 'c91a79a505ff2ecaedb60a24aae9a3a69e481038'
     and 'cadde6e7c89af7d59a9c0f084a480835c1c4c4e1'