[sagator/f14: 3/3] Merge branch 'master' into f14

[Ján ONDREJ]

commit d97b152989b09dd8bda60b0445639263a7315978
Merge: 4c5425b 248d9b3
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Sat May 14 09:03:40 2011 +0200

    Merge branch 'master' into f14

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