[gnome-gmail/f14/master: 2/2] Merge branch 'master' into f14

[Guillaume Kulakowski]

commit 7d2d82e4127b3ae4b058d6a612f5ec0356db327f
Merge: e5f304a 740d205
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date:   Sat Nov 6 12:40:23 2010 +0100

    Merge branch 'master' into f14

 gnome-gmail.spec |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)
---