From: rui Batista <ruiandrebatista@gmail.com>
Date: Tue, 27 Nov 2012 12:23:46 +0000 (+0000)
Subject: Merged main.
X-Git-Tag: jpdev130418~364^2~19
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d3359cc7752e8f941510d8aec6cfb7f6cd941499;p=nvdajp%2Fnvdajp.git

Merged main.
---

d3359cc7752e8f941510d8aec6cfb7f6cd941499