OSDN Git Service

Merge commit '690d20bb53ba2485f59d128b365eff991d5cc3e6' into manualmerge
authorDianne Hackborn <hackbod@google.com>
Sun, 9 Jan 2011 19:59:12 +0000 (11:59 -0800)
committerDianne Hackborn <hackbod@google.com>
Sun, 9 Jan 2011 19:59:12 +0000 (11:59 -0800)

Trivial merge