Merge warning fix from trunk. Fixes #1414.

[SVN r58747]
This commit is contained in:
Daniel James 2010-01-06 08:55:23 +00:00
parent 43b2ea667b
commit b301b2ecef

@ -1 +1 @@
Subproject commit 772d182b241ca91d715e4c80b44b1dc2e3c264d9
Subproject commit 93932c0d55241c6d06a05b0270ca0d4a95a2f133