Merge branch 'primitive-restart-cleanup'
authorBrian Paul <brianp@vmware.com>
Fri, 22 Oct 2010 01:05:40 +0000 (19:05 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 22 Oct 2010 01:05:47 +0000 (19:05 -0600)
commit69a07be3e527dbc2148a4e20c50e60266225f5f2
tree82583b98708fc7a6c33b471d45670e2566ed0daf
parent1d91f8d9164b38b4c924f43ec4fc5ceb65c96a78
parentb2d4dfe5cc5b24743175bf35285dfc57f86bc09d
Merge branch 'primitive-restart-cleanup'

Conflicts:
docs/relnotes-7.10.html

This branch is a re-do of the primitive-restart branch with all
the intermediate/temporary stuff cleaned out.
docs/relnotes-7.10.html