Merge branch 'master' into v4.6.x
authorArun Persaud <arun@nubati.net>
Wed, 29 Feb 2012 06:00:27 +0000 (22:00 -0800)
committerArun Persaud <arun@nubati.net>
Wed, 29 Feb 2012 06:00:27 +0000 (22:00 -0800)

Trivial merge