merge of '14dd1ebc66d8ff7879e828544c4b811a8b57489a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Sep 2007 16:19:06 +0000 (16:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Sep 2007 16:19:06 +0000 (16:19 +0000)
commitb277442ca6f4a0648fe5cfdd33b5a6b5f24f55ee
tree2b5afff15f5ec0eda9f0f9caf5c043f12adf197f
parent5c6262bc5a3b1ed73553a4f3e40f324a2a7772ad
parente3c570ae9c1f668acd8499b9c5849235ffd77dd8
Merge ... '14dd1ebc66d8ff7879e828544c4b811a8b57489a'
     and '1b8907dc6ebfe86113a2413b6b55a43e8b7a1add'