merge of '686e9c3c9548df9c0c138bec3dbfc29bd7d8c301'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 14:02:56 +0000 (14:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 14:02:56 +0000 (14:02 +0000)
commit0ed630ee92d26828b61f1de72dc0b33d2a056123
treecacd84f47a7bee88f7f16aaea38c170a72544e3c
parentace0f7c5b3ff46b93e13947f831a4c826651e070
parenta433f3914ac13b11d980cbcf90e38e7a91ade1a7
Merge ... '686e9c3c9548df9c0c138bec3dbfc29bd7d8c301'
     and '9ad4a40895cac3d0144289560f4f5fc76596d11a'