Merge branch 'newtree'
authorWANG <wang@wang-OptiPlex-780.(none)>
Fri, 30 Aug 2013 15:40:47 +0000 (17:40 +0200)
committerWANG <wang@wang-OptiPlex-780.(none)>
Fri, 30 Aug 2013 15:40:47 +0000 (17:40 +0200)

Trivial merge