Merge remote branch 'origin/master' into perm
authorDan Williams <dcbw@redhat.com>
Tue, 1 Jun 2010 22:34:53 +0000 (15:34 -0700)
committerDan Williams <dcbw@redhat.com>
Tue, 1 Jun 2010 22:34:53 +0000 (15:34 -0700)

Trivial merge