From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 11 Jun 2011 08:10:01 +0000 (+0200)
Subject: Merge branch 'master', remote-tracking branch 'upstream/master'
X-Git-Tag: v2.20-rc1~138^2~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42fe2b2b2d19d09241bd7c3dd811463e0095d4aa;p=thirdparty%2Futil-linux.git

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