[dumpasn1/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17

[François Kooman]

commit dbbb179f1cb06290d016b83cd8ce3f98adca59a9
Merge: 4f5d907 7d20498
Author: François Kooman <fkooman at tuxed.net>
Date:   Sat Jun 9 11:44:47 2012 +0200

    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	dumpasn1.spec
    	sources

 dumpasn1.spec |    5 ++++-
 sources       |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---