Merging from ge_dev to trunk r58091-58422.
authorMitchell Stokes <mogurijin@gmail.com>
Fri, 19 Jul 2013 22:37:40 +0000 (22:37 +0000)
committerMitchell Stokes <mogurijin@gmail.com>
Fri, 19 Jul 2013 22:37:40 +0000 (22:37 +0000)

Trivial merge