Pull ticket-spinaphore into release branch
Tony Luck [Sat, 24 Oct 2009 00:59:06 +0000 (17:59 -0700)]

Trivial merge