cchris - 2010-11-07

SVN Patch aainst rev 693