conflict merge
authoradam <adam@megacz.com>
Mon, 10 May 2004 04:21:47 +0000 (21:21 -0700)
committeradam <adam@megacz.com>
Mon, 10 May 2004 04:21:47 +0000 (21:21 -0700)
commitca3a0241d39131e0ca2205f4683ed09f557340d3
tree967c9ccbe13fe910d4898e9143bda75f7575be47
parenta84e68b3afbccc743521349e13ea6fa508199e30
conflict merge

darcs-hash:20040510042147-5007d-3b678b86f5adb3a552465804d86b978c7764f792.gz
doc/nestedvm.ivme04.tex