[mirall/f18: 5/5] Merge branch 'master' into f18

[Joseph Marrero]

commit 496f50fab1411f02335e17f56a6c10e1d364a2b5
Merge: 8e01153 c551d6f
Author: Joseph <joseph at localhost.localdomain>
Date:   Sat Jan 19 19:08:03 2013 -0400

    Merge branch 'master' into f18

 mirall-1.2.0beta1.tar.bz2 |  Bin 595588 -> 0 bytes
 mirall-1.2.0beta2.tar.bz2 |  Bin 0 -> 648520 bytes
 mirall.spec               |   15 +++++++++------
 3 files changed, 9 insertions(+), 6 deletions(-)
---