From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 19 Jan 2011 20:00:44 +0000 (+0100)
Subject: Merge branch 'master' into debian
X-Git-Tag: show~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db92affc526b38a73b6a0fb444710653bf575df5;p=yubikey-personalization.old

Merge branch 'master' into debian
---

db92affc526b38a73b6a0fb444710653bf575df5