Merge Variant from the trunk.

[SVN r78341]
This commit is contained in:
Steven Watanabe 2012-05-05 21:22:36 +00:00
parent 057abd6146
commit 7720587259

@ -1 +1 @@
Subproject commit 2a6c6f3948f20ef92151751f318c6643690ecbc1
Subproject commit 5b34fe155f657d8484b33feb3990a85804500718