Merge branch 'master' into v4.7.x
authorArun Persaud <arun@nubati.net>
Thu, 21 Feb 2013 05:59:30 +0000 (21:59 -0800)
committerArun Persaud <arun@nubati.net>
Thu, 21 Feb 2013 05:59:30 +0000 (21:59 -0800)

Trivial merge