From: James Teh <jamie@jantrid.net>
Date: Wed, 24 Nov 2010 01:38:02 +0000 (+1000)
Subject: Merge main.
X-Git-Tag: jpdev130418~2082^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=356f8409915890331ef5be3d0c5125118d8652f3;p=nvdajp%2Fnvdajp.git

Merge main.
---

356f8409915890331ef5be3d0c5125118d8652f3