Merge branch 'master' into test
tree1a120b5508e45baa25be997f3660c2a132c11a62
-rw-r--r-- 11833 libs.py.2.2_rc6.patch
drwxr-xr-x - pym
-rw-r--r-- 159 sets.conf
-rw-r--r-- 397 sets.conf.2.2_rc6.patch
-rw-r--r-- 10139 vartree.py.2.2_rc6.patch