merge of '2b134fb4a5278b379deec7fbafe34576ac3f266c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 6 Mar 2008 17:58:28 +0000 (17:58 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 6 Mar 2008 17:58:28 +0000 (17:58 +0000)
commitbe3ea0c1dad004e8ad2e5ea113880e3769fa2b18
tree82076c288c87484c949c68ded151e384f5b3f665
parent9ce9cc1d57bb17dbc03a0a9ecc744e2778759e36
parent9fab57528848c104a95662bfb416378d7e50d666
Merge ... '2b134fb4a5278b379deec7fbafe34576ac3f266c'
     and '7c95723b0419570396f3810cc7a82f22626eb854'