Merge branch 'for-2.6.39' into for-2.6.40
authorJ. Bruce Fields <bfields@redhat.com>
Thu, 7 Apr 2011 19:19:21 +0000 (15:19 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Thu, 7 Apr 2011 19:19:21 +0000 (15:19 -0400)

Trivial merge