Merge branch 'master' into v4.6.x
authorArun Persaud <arun@nubati.net>
Sat, 5 Nov 2011 19:37:11 +0000 (12:37 -0700)
committerArun Persaud <arun@nubati.net>
Sat, 5 Nov 2011 19:37:11 +0000 (12:37 -0700)

Trivial merge