[mirall/f17: 3/3] Merge branch 'master' into f17

[Joseph Marrero]

commit a2b9964d54d371363e3034ac1d8cf9880a32a922
Merge: 33ceb1d 809fb7f
Author: joseph <joseph at localhost.localdomain>
Date:   Thu Apr 11 14:48:26 2013 -0400

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

 mirall.spec |  163 -----------------------------------------------------------
 1 files changed, 0 insertions(+), 163 deletions(-)
---