2011-06-28  sylvanaar  <sylvanaar@mindspring.com>

[30892b68ac8e] [3.3.16]
* Merge