From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Thu, 2 Feb 2012 14:01:03 +0000 (+0000)
Subject: Merge branch 'master' into d2d
X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=e7ea01e6b99d1a8123328047d1bfaeba624832bb

Merge branch 'master' into d2d
---

e7ea01e6b99d1a8123328047d1bfaeba624832bb