[gcal/f17: 4/4] Merge branch 'master' into f17

[Daiki Ueno]

commit 5ffdeaf126fc7e82700e04e58e7d30316f8b784a
Merge: 8eb1980 0278745
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Mon Sep 3 11:05:57 2012 +0900

    Merge branch 'master' into f17

 gcal.spec |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---