Merge branch 'for-3.10' into 'for-3.11'
authorJ. Bruce Fields <bfields@redhat.com>
Mon, 1 Jul 2013 21:22:14 +0000 (17:22 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 1 Jul 2013 21:22:24 +0000 (17:22 -0400)
Merge bugfixes into my for-3.11 branch.


Trivial merge