Merge branch 'master' of git://github.com/gentoo/hwids
authorDiego Elio Pettenò <flameeyes@flameeyes.eu>
Mon, 2 Jun 2014 11:45:56 +0000 (04:45 -0700)
committerDiego Elio Pettenò <flameeyes@flameeyes.eu>
Mon, 2 Jun 2014 11:45:56 +0000 (04:45 -0700)

Trivial merge