merge of '0d7f35f44f5002f7df5f605bc373d3feecb8602d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 3 Jan 2008 15:24:40 +0000 (15:24 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 3 Jan 2008 15:24:40 +0000 (15:24 +0000)
commit23f2decbe62225e537aa4b8b72daf0f307340bbf
treea676fa63b1bee47bda076259582eeb9f2e643fd7
parent7377bcfa7701f0d9b88d5d312b40d356b0f0e018
parente084786aed2d73221570ea9f0199a85890ac231f
Merge ... '0d7f35f44f5002f7df5f605bc373d3feecb8602d'
     and '40bac439643c75e92f89252f0b5dfe329b2b8119'