Merge remote-tracking branch 'drebs/feature/3397-keymanager-should-support-bundled...
authorTomás Touceda <chiiph@leap.se>
Thu, 8 Aug 2013 14:08:18 +0000 (11:08 -0300)
committerTomás Touceda <chiiph@leap.se>
Thu, 8 Aug 2013 14:08:18 +0000 (11:08 -0300)

Trivial merge