Merge branch '0.16'
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 13 Sep 2009 15:32:27 +0000 (16:32 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Sun, 13 Sep 2009 15:32:27 +0000 (16:32 +0100)
commit56cc06f89b7db733e5036a00df7aea27cf8d0951
tree2ab32d99ffd92fe7e7970a25d67bb2881df82b14
parent8aff99e231dcb83fa6c08e760711b0a1e979d012
parent8035df8bcb01c2df42b8adf8b96c7ac796f384cc
Merge branch '0.16'

Conflicts:
configure.ac
pixman/pixman-sse2.c
pixman/pixman-sse2.c