Merge branch 'class_hint' of https://github.com/Kintaro/rust-xlib int… …
…o class_hint Conflicts: src/xlib.rs