From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 25 Jun 2011 15:35:59 +0000 (+0200)
Subject: Merge branch 'master', remote-tracking branch 'upstream/master'
X-Git-Tag: v2.20-rc1~131^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=797d5388c47de7cbe11f067b9c29e872db13d730;p=thirdparty%2Futil-linux.git

Merge branch 'master', remote-tracking branch 'upstream/master'
---