Upgrade to Qt 4.8.4
Merge remote-tracking branch 'upstream/master'
Implement system.std{in,out,err}

Implementing `system.std{in,out,err}` as per [Issue
333](http://code.google.com/p/phantomjs/issues/detail?id=333) and
pull request #192.

**Caveat**

Since `File` is used for the implementation, `read` maps to
`File::read`, which is essentially equivalent to a `readAll`.
This can be changed at some later date to match [IO/A Spec's
`Stream#read`](http://wiki.commonjs.org/wiki/IO/A#Instance_Methods);
but, should still be noted.
Add `seek` method to `File` class

This method is necessary for random-access streams.  It will also be
helpful in the future when implementing the [IO/A][1] interface.

[1]: http://wiki.commonjs.org/wiki/IO/A#Instance_Methods
Implement CommonJS IO/A read([n Number])

The [spec][1] for `read` is as follows:

> Read up to n bytes from the stream, or until the end of the stream
> has been reached. [If] n is null, reads up to the block size of the
> underlying device, or up to 1024 bytes if the block size is not
> discernible. If n is not specified, this method always reads the
> full stream until its end is reached. ...

Since discovering the block size of the underlying device is
non-trivial, we will just default to 1024.

**NOTE**

The initial implementation of `File::read()` saves the current
(original) position, seeks to the beginning of the stream,
`readAll`s to the end, and then resets to the original position.
However, I think that this behavior is unexpected and should be
changed--it should read from the current position to the end of the
stream and stay there.  The user should explicitly `seek` to the
beginning of the stream when necessary.

  With the current implementation, the user should note that the
position will not change after calling `read()` with no arguments.

[1]: http://wiki.commonjs.org/wiki/IO/A#Instance_Methods
Merge remote-tracking branch 'upstream/master'
Merge branch 'stdin-stdout-stderr' of https://github.com/execjosh/phantomjs
Merged
Catching up
Adding the whole 'bin' folder to '.gitignore'

On Windows, there are 3 files produced in the 'bin' folder and none of them should be checked in.
Prevent possible crash on pages with iframes.

In some cases, setupFrame() has not been invoked (due to the queued
signal-slot connection) after the frame is destroyed and thus leads
to the crash. We prevent this from happening by making sure it is a
direct connection instead and therefore setupFrame() will be executed
as soon as possible.

Investigation + patch by Vitaliy Slobodin <vitaliy.slobodin@gmail.com>.

http://code.google.com/p/phantomjs/issues/detail?id=947
Updated help output to prefer true/false to yes/no

Similarly, I updated the API Reference too:
https://github.com/ariya/phantomjs/wiki/API-Reference/7cddd19676a917535b74d386c3974da00fbbe793

This arguably makes more sense to PhantomJS's typical audience of web developers.
Merged
Merge remote-tracking branch 'upstream/master' into patch-3