merge of '0d25e98bdf0c1d029587a346db9cb19346e4c78c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Sep 2008 14:15:17 +0000 (14:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Sep 2008 14:15:17 +0000 (14:15 +0000)
commit0307561c352e512a19e55d0caf2f1be5594a536d
tree4e0fe58788b3322da75a5c26a35e0438d079da7f
parentd618eaa7203f6cafe3b8eb9ed165ff11b9a63e6a
parent182279ea7d3a69578d253d69b6ece04541405098
Merge ... '0d25e98bdf0c1d029587a346db9cb19346e4c78c'
     and '24fd9b0c38a6b8e16bb8f4d92f03a041ab500e9d'