[goffice/f13/master: 2/2] Merge branch 'master' into f13

[belegdol]

commit 92a8f69a7f558f08b1e6426594e4a1ab08f81dd5
Merge: 8f1655b 1f1a230
Author: Julian Sikorski <belegdol at gmail.com>
Date:   Mon Aug 23 18:10:02 2010 +0200

    Merge branch 'master' into f13

 .gitignore   |    1 +
 goffice.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---