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

[belegdol]

commit f94f9c4a75d12d79ec3a94e1c08cacef3990cdfa
Merge: 92a8f69 60aea89
Author: Julian Sikorski <belegdol at gmail.com>
Date:   Thu Sep 9 08:42:07 2010 +0200

    Merge branch 'master' into f13

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