Commit eed634a3aba5ff708e60923740cbb86d5cef0cdf

Znort 987 2011-08-16T00:04:50

Merge branch 'ckolivas-master' into merge-ckolivas-master