Merge zizzer:/bk/multiarch

into  zeep.eecs.umich.edu:/z/saidi/work/m5.multiarch

--HG--
extra : convert_revision : 88b5214973ecc2f5c0428da21b65b09c767ae31d

util/emacs/m5-c-style.el

@@ -1,4 +1,4 @@
-; Copyright (c) 2003-2004 The Regents of The University of Michigan
+; Copyright (c) 2003-2004, 2006 The Regents of The University of Michigan
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,7 @@
 
 (c-add-style "m5"
 	     '((c-basic-offset . 4)
+               (indent-tabs-mode . nil)
 	       (c-offsets-alist . ((substatement-open . 0)
 				   (inline-open . 0)
 				   (block-open . -4)