some refactor & fix image size compute
add comment & add ref test
Basic support for Document::contentType

Spec:
http://dom.spec.whatwg.org/#dom-document-contenttype

This is a subtask for #1428, #1510 and #1526.
add assign_height in box_
auto merge of #1525 : brunoabinader/servo/document-contenttype, r=Ms2ger

Spec:
http://dom.spec.whatwg.org/#dom-document-contenttype

This is a subtask for #1428 and #1510.
Add the Rust crate map to the servo library and dependency on libuv
auto merge of #1530 : larsbergstrom/servo/android_fixups, r=metajack

These two fixes are required for Android. We need to generate a toplevel crate map because it is used by both debugging and the libuv stuff. We also need to manually link against rustuv because we cannot dynamically inject it on Android.

r? @metajack
added vim tmp files to git ignore
auto merge of #1531 : ibnc/servo/git_ignore_vim, r=larsbergstrom

For me and fellow vim users.
layout: Implement parallel reflow for the bubble-widths and
assign-heights phases.

This uses the new work-stealing deque. By default, 3/4 of a thread per
logical CPU is used. This can be tuned with the `-y` flag.

I measured a 65% reflow speedup on `perf-rainbow.html` and a 247% reflow
speedup on `http://en.wikipedia.org/wiki/South_China_Sea` on a 4-core
HyperThreaded Core i7. However, numbers were fairly volatile, especially
for the latter.
Change `get_attr()` to `get_attr_val_for_layout()`.

The old code was used by both layout and script, but was erroneously
borrowing for the layout case (which causes parallelism
problems). script now uses only `value_ref()` or `get_attribute()`, and
layout now has its own unsafe version that dances around the borrows of
`@mut Attr`.
auto merge of #1493 : pcwalton/servo/parallel-layout-new, r=pcwalton,metajack

r? @metajack
auto merge of #1533 : metajack/servo/unsafe-get-attr, r=jdm

The old code was used by both layout and script, but was erroneously
borrowing for the layout case (which causes parallelism
problems). script now uses only `value_ref()` or `get_attribute()`, and
layout now has its own unsafe version that dances around the borrows of
`@mut Attr`.
auto merge of #1520 : ksh8281/servo/img_s, r=pcwalton

it makes same result with firefix, chrome in http://www.w3.org/Style/CSS/Test/CSS1/current/sec5523.htm
fix text-decoration property in layout
change position of setting inline_data for "<span>asdf<div>b</div></span>" case
fix line-height property
add RareFlowFlags
RareFlowFlags -> ~RareFlowFlags
auto merge of #1506 : ksh8281/servo/inline_add, r=pcwalton

add inline stuff & color support
it makes same result with firefox in "http://www.w3.org/Style/CSS/Test/CSS1/current/sec543.htm"
makes line-height property can inherit