Merge remote branch 'origin/master' into tzz-auth-source-rewrite
authorTed Zlatanov <tzz@lifelogs.com>
Sun, 6 Feb 2011 19:30:24 +0000 (13:30 -0600)
committerTed Zlatanov <tzz@lifelogs.com>
Sun, 6 Feb 2011 19:30:24 +0000 (13:30 -0600)

Trivial merge