merge from trunk.
commit05d06747421a41079efca12d9891e15026b7dbdf
authorRob Savoye <rob@welcomehome.org>
Tue, 15 Jun 2010 17:02:04 +0000 (15 11:02 -0600)
committerRob Savoye <rob@welcomehome.org>
Tue, 15 Jun 2010 17:02:04 +0000 (15 11:02 -0600)
tree2fafa9009b444edde24fc01ee911998728ef9a22
parent4f3ca5f2d1e951aba14543b3a12b103111f49a5a
parent59d2af5e81dcc5b1708242e9e5f378d37516df00
merge from trunk.
plugin/npapi/plugin.h
plugin/npapi/scriptable-test.html