OSDN Git Service

Merge commit 'origin/master' into nptl
authorAustin Foxley <austinf@cetoncorp.com>
Fri, 23 Apr 2010 13:55:42 +0000 (06:55 -0700)
committerAustin Foxley <austinf@cetoncorp.com>
Fri, 23 Apr 2010 13:56:46 +0000 (06:56 -0700)
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>

Trivial merge