diff -r 73992021c8f0 -r a7072d498723 Paper/document/acmconf.cls
--- a/Paper/document/acmconf.cls	Fri Mar 19 18:56:13 2010 +0100
+++ b/Paper/document/acmconf.cls	Fri Mar 19 21:04:24 2010 +0100
@@ -422,9 +422,9 @@
                                    \parbox{2.8in}{\small #1}}%
      \else \copyrightspace \fi}
 
-\def\marginpar{\ClassError{acmconf}%
-   {The \protect\marginpar command is not allowed in the `acmconf' document class}%
-   {Remove the \protect\marginpar\space command from the file}}
+%\def\marginpar{\ClassError{acmconf}%
+%   {The \protect\marginpar command is not allowed in the `acmconf' document class}%
+%   {Remove the \protect\marginpar\space command from the file}}
 
 \mark{{}{}}   % Initializes TeX's marks