[gtk-murrine-engine/el6: 13/13] Merge branch 'master' into el6

[Martin Sourada]

commit 32ab2c871dd0adc5a334cf79ec7e2ad8b2f77fa6
Merge: d0e6200 869e5b2
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Thu Mar 22 09:06:02 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    
    Update to latest vesion.

 .gitignore              |   16 +++++++++-------
 gtk-murrine-engine.spec |   33 ++++++++++++++++++++++++++++-----
 sources                 |    2 +-
 3 files changed, 38 insertions(+), 13 deletions(-)
---