Merge remote-tracking branch 'drebs/bug/3397-keymanager-should-support-bundled-gpg...
authorTomás Touceda <chiiph@leap.se>
Fri, 9 Aug 2013 00:47:35 +0000 (21:47 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 9 Aug 2013 00:47:35 +0000 (21:47 -0300)

Trivial merge