merge of 'bb8fbe01b0ec479cc2c248dbdbf80b35b77226f3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 14:53:50 +0000 (14:53 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 14:53:50 +0000 (14:53 +0000)
commitb2585d5a44ba251fe7738060f5e8ae340b880895
treec2ace769c974464f0e124649743c3de9dd199a4e
parent7b7b0454dcc91d47e64ed9d7ada8985f97ac37e6
parentdf4407fc33ff238dbe5992a4383848ccd4bcef27
Merge ... 'bb8fbe01b0ec479cc2c248dbdbf80b35b77226f3'
     and 'c1f653cd19069cdecd2aea81867ec8e2a5ba68a5'