Update for language changes
Merge pull request #53 from brson/master

Update for language changes
str::from_bytes is now str::from_utf8
Merge pull request #54 from brson/master

str::from_bytes is now str::from_utf8
Change ~str params to &str
Merge pull request #55 from pshc/master

Change ~str params to &str
Upgrade Rust.
Merge pull request #56 from metajack/uprust

Upgrade Rust.
Use size_of from its new location.
Add GLX and improved CGL support
Merge pull request #57 from pcwalton/master

Add GLX and improved CGL support
Merge branch 'master' of git://github.com/mozilla-servo/rust-opengles into q3

Conflicts:
	gl2.rs