Merge pull request #12 from spacedentist/master

Fix building on Ubuntu Quantal and with Qt 4.6