2.2.1 (stable):

* Really fix the build with Sun CC.
  (Elaine Xiong. Bug #302098)

2.2.0 (stable):