Merge oauth branch at r17138 to trunk.
authorTom Hughes <tom@compton.nu>
Tue, 18 Aug 2009 20:02:52 +0000 (20:02 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 18 Aug 2009 20:02:52 +0000 (20:02 +0000)

Trivial merge