Merge branch 'master' of https://code.google.com/p/nanopb
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>
Sat, 19 May 2012 18:25:47 +0000 (21:25 +0300)
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>
Sat, 19 May 2012 18:25:47 +0000 (21:25 +0300)

Trivial merge