Merge branch 'master' into patchapi_snippet
authorAndrew Bernat <bernat@cumin.cs.wisc.edu>
Sat, 17 Dec 2011 02:48:53 +0000 (20:48 -0600)
committerAndrew Bernat <bernat@cumin.cs.wisc.edu>
Sat, 17 Dec 2011 02:48:53 +0000 (20:48 -0600)
commit3fcc10f6a561998f31684613f9f1213edbe9b120
tree7cd9cf3c530ee7da615b5064c383872d5245a7fc
parent4e9f0e194d6468b7ba39b32063ed31fc8620bc41
parent23f52d8bd2502d2c5c7e01791d5e6c0e4c3da233
Merge branch 'master' into patchapi_snippet

Conflicts:
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/src/Relocation/DynInstrumenter.C
dyninstAPI/src/function.C
dyninstAPI/src/inst-power.C
patchAPI/make.module.tmpl
stackwalk/src/linux-swk.C
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/src/Relocation/DynInstrumenter.C
dyninstAPI/src/inst-power.C
patchAPI/make.module.tmpl
patchAPI/src/PatchMgr.C
stackwalk/src/linux-swk.C