Merge branch 'dockable'
Conflicts: src/openshowvartree.cpp
Authored by: Massimiliano Fago 2010-01-19
Parents: [15648f][7cdca3]
Child: [909f21]