Merge remote-tracking branch 'google/hotfix/rpm-package-architecture'
authorAndreas Schuh <andreas.schuh.84@gmail.com>
Thu, 20 Mar 2014 20:24:30 +0000 (20:24 +0000)
committerAndreas Schuh <andreas.schuh.84@gmail.com>
Thu, 20 Mar 2014 20:24:30 +0000 (20:24 +0000)

Trivial merge