[cd-discid/el6: 7/7] Merge branch 'master' into el6

[Dominik Mierzejewski]

commit 291a208ef407adf7590fa39204e64c731f5f1d00
Merge: 3346d57 7bafa4c
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Sun Dec 23 18:08:29 2012 +0100

    Merge branch 'master' into el6
    
    Rebase to latest upstream release.
    
    Conflicts:
    	.gitignore

 ...sible-to-prevent-stripping-e.g.-with-STRI.patch |   35 ++++++++++++++++++++
 cd-discid.spec                                     |   32 ++++++++++++------
 sources                                            |    2 +-
 3 files changed, 57 insertions(+), 12 deletions(-)
---