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

[Guillaume Kulakowski]

commit c1020a0f19ab2e7a8f7fd73a0d4bfbb23feefdf6
Merge: 101cd3d 09ec6a0
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date:   Sun Oct 24 10:19:30 2010 +0200

    Merge branch 'master' into f14

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---