Merge remote-tracking branch 'drebs/feature/key-manager' into develop
authorTomas Touceda <chiiph@leap.se>
Fri, 3 May 2013 17:36:42 +0000 (14:36 -0300)
committerTomas Touceda <chiiph@leap.se>
Fri, 3 May 2013 17:36:42 +0000 (14:36 -0300)

Trivial merge