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

[Jussi Lehtola]

commit 826f2a0dbc267c5fa56c639ef0cd65da4f7c9cfd
Merge: 23d7c70 b4fb2ce
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Jul 10 14:06:13 2012 +0300

    Merge branch 'master' into f17

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