Merge Duclair release into master branch
authorJohn Koleszar <jkoleszar@google.com>
Fri, 27 Jan 2012 22:08:27 +0000 (14:08 -0800)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 27 Jan 2012 22:08:40 +0000 (14:08 -0800)
Change-Id: Ibf577972e8cd10488d44385ff74f136a07466c0c


Trivial merge