Merge from vendor branch TNF:
authorcherry <cherry>
Wed, 27 Jul 2011 10:23:50 +0000 (10:23 +0000)
committercherry <cherry>
Wed, 27 Jul 2011 10:23:50 +0000 (10:23 +0000)
commit3f84fba4e6846eeb7f443cb222dd769615fd6648
tree4afe88bd5817113e023d1244c994b8518e28d8c1
parent5d81bf8180ea2297ac740f2961737562cbf5cf6e
parent62d44fe9616280da3cfeae5fa55a94ea165bc4b2
Merge from vendor branch TNF:
import wip/ski