Commit c5a7b6906f23dcbd01615f7aa3696c3b1ada1159
2011-10-26T02:45:44
Fix compilation due to merge issue. Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@808 736b8ea6-26fd-11df-bfd4-992fa37f6226