Merge in from trunk r64802 - r68625
authorSteve Lamerton <steve.lamerton@gmail.com>
Wed, 10 Aug 2011 18:10:42 +0000 (18:10 +0000)
committerSteve Lamerton <steve.lamerton@gmail.com>
Wed, 10 Aug 2011 18:10:42 +0000 (18:10 +0000)
commit94e0018723919fe2ca2f5b5f0a42804c16dbf3a1
tree988c87210aee1975682e6e08f4654007bd38ca9c
parent3baf235f60c2e924fee2cd2de03e544343c15529
parentcbef7338c1c7763042704c74d5ee6f62c7e10733
Merge in from trunk r64802 - r68625

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
tests/test.bkl