Committing changes that work on Ubuntu 11.10 with pinkit 61206