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

[Jussi Lehtola]

commit 0092b3f9bf2b0f8ee6b9ed96c30e1712dc89ed2c
Merge: e4847b4 a7dee13
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Sun Nov 4 21:19:51 2012 +0200

    Merge branch 'master' into f17

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