Merge inline rule warning fixes
authorPaolo Capriotti <p.capriotti@gmail.com>
Thu, 26 Jul 2012 21:05:19 +0000 (22:05 +0100)
committerPaolo Capriotti <p.capriotti@gmail.com>
Thu, 26 Jul 2012 21:05:44 +0000 (22:05 +0100)

Trivial merge