From: James Teh <jamie@jantrid.net>
Date: Thu, 22 Mar 2012 04:47:35 +0000 (+1000)
Subject: Merge 2012.1.
X-Git-Tag: jpdev130418~992
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8d350babf71b12c22c8418f06261c787ce7190c6;p=nvdajp%2Fnvdajp.git

Merge 2012.1.
---

8d350babf71b12c22c8418f06261c787ce7190c6