OSDN Git Service

Merge remote branch 'origin/master' into nptl
authorAustin Foxley <austinf@cetoncorp.com>
Wed, 16 Dec 2009 03:19:39 +0000 (19:19 -0800)
committerAustin Foxley <austinf@cetoncorp.com>
Wed, 16 Dec 2009 03:35:37 +0000 (19:35 -0800)
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>

Trivial merge