[cppcheck/f17: 2/2] Merge branch 'master' into f17

[François Cami]

commit d4e0db285074aa451dd123b46890c86b3ea4c1c4
Merge: 0092b3f c943825
Author: François Cami <fcami at fedoraproject.org>
Date:   Tue Jan 15 01:21:16 2013 +0100

    Merge branch 'master' into f17

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