Merge.
Merge branch 'dev' of http://github.com/flavioc/meld into dev