Testing out Ubuntu 12.10 fix.
Testing out Ubuntu 12.10 fix.
Merge branch 'ubuntu_12_10_fix'