Merge branch 'browser-windows'
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Tue, 14 Jun 2011 22:58:02 +0000 (18:58 -0400)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Tue, 14 Jun 2011 22:58:02 +0000 (18:58 -0400)

Trivial merge