Merge vm1.(none):/home/stever/bk/newmem-head

into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : fba7efd444e1ca9738385dd4662a33feab357e79

diff --cc src/mem/cache/coherence/SConscript
index 7b94f73e15bc9176d5f080175b10b57bcaa295b0,4f59661403d0a212857433439819c7f47fc60153..91720b20e8d89c9514dc100948824416ccf6d778
--- 1/src/mem/cache/coherence/SConscript
--- 2/src/mem/cache/coherence/SConscript
+++ b/src/mem/cache/coherence/SConscript
@@@ -30,5 -30,8 +30,7 @@@
  
  Import('*')
  
+ SimObject('CoherenceProtocol.py')
+ 
  Source('coherence_protocol.cc')
 -Source('uni_coherence.cc')