[idjc/f17: 2/2] Merge branch 'master' into f17

[Nikos Roussos]

commit 11ee1a0fe6c862a2c7d7c4ca2b8539484b090936
Merge: 3d27f59 326b739
Author: comzeradd <nikos at autoverse.net>
Date:   Mon Feb 13 14:43:40 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	idjc.spec

 .gitignore |    1 +
 idjc.spec  |    5 +++--
 sources    |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
---