merge of '274cb1a3f97188420857e4b0650a1ace718148a6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:22:16 +0000 (11:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:22:16 +0000 (11:22 +0000)
commit4b7e6a49215b00d0cfa9a0fde3808f032a9599e5
treef2e294728789ab01a7a89fa06b6c67c5464ceab0
parent4601ad28765bf7ef207974f9ad7fc209d3745088
parent8f19556367701b3a3fa50802903d0d67997407b7
Merge ... '274cb1a3f97188420857e4b0650a1ace718148a6'
     and '8091ca9b08503f4700e05ee8973cec755727ed4a'