From 2f1a8d38e05916ca19434caece4b71bb773f5263 Mon Sep 17 00:00:00 2001
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Date: Thu, 31 May 2012 16:26:06 -0700
Subject: [PATCH] --- yaml --- r: 309711 b: refs/heads/master c:
 5401cf3fac92b35415c1d011e9866a90b8bed88f h: refs/heads/master i:   309709:
 863e5233031642982171fc184b4ed86e2871c772   309707:
 28abc106339f15f133d5440ded9901e2ecea7401   309703:
 c2a8177c8eeb5fed0cf3830b2025206a8520f071   309695:
 9291771c28294bf03bdf239257c68882cf7429ec v: v3

---
 [refs]         | 2 +-
 trunk/.mailmap | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ecf2542835f6..6b8ca2704c6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ceb5c16f5aa1021e9ef8f5e6c41feba288f963b
+refs/heads/master: 5401cf3fac92b35415c1d011e9866a90b8bed88f
diff --git a/trunk/.mailmap b/trunk/.mailmap
index 9b0d0267a3c3..2909c33bc54e 100644
--- a/trunk/.mailmap
+++ b/trunk/.mailmap
@@ -113,3 +113,5 @@ Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
 Takashi YOSHII <takashi.yoshii.zj@renesas.com>
 Yusuke Goda <goda.yusuke@renesas.com>
+Gustavo Padovan <gustavo@las.ic.unicamp.br>
+Gustavo Padovan <padovan@profusion.mobi>