Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 2 Mar 2012 11:08:18 +0000 (12:08 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 2 Mar 2012 11:08:18 +0000 (12:08 +0100)
commit962ed96aad6862d044823aa2855b2a62ff2c450d
treedcbd2dbbdc81eb541346f28e89e943c502f37a50
parent32bb92f2fad6a23ecefb0ee6c4225b1358994c6d
parent55ed21691133a25c74336614efe4cae23497d03a
Merge branch 'master' into 0.11

Conflicts:
tests/examples/Makefile.am