[ghemical: 13/13] Merge remote branch 'origin/f12/master'

[Dominik Mierzejewski]

commit 156a2d34e7fd7d762dae30094b8a7d26baf46435
Merge: 2153f24 5734bb2
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Tue Nov 30 21:04:44 2010 +0100

    Merge remote branch 'origin/f12/master'
    
    Conflicts:
    	ghemical.spec

---