merge from 4.0 branch
authorAaron Peachey <alpeachey@gmail.com>
Thu, 16 Jun 2011 10:31:36 +0000 (20:31 +1000)
committerAaron Peachey <alpeachey@gmail.com>
Thu, 16 Jun 2011 10:31:36 +0000 (20:31 +1000)
commit8133918de3f6a07292119a0a343548f18bacde8a
tree1b1313d20bc5e8bf152a149ca3e68a496efa7fc5
parenta938b95936fd257208624d859bd6abda959e0efb
parent6baa6073dfdcd27d3d24c9fca8e4c8e18716d091
merge from 4.0 branch