Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 14 Jun 2012 13:44:18 +0000 (15:44 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 14 Jun 2012 13:44:18 +0000 (15:44 +0200)
commitde82bfbbba06172c9f365a3079050daa1b36f3da
tree63da0c9bc441c9fa55d74710a6da93a88ae61e47
parent4a58fd4be4444b8195c438ccc6445ced5c2e532d
parentce7f65f752dfff124c672a418bbd1728df2fd137
Merge remote-tracking branch 'origin/0.10'