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

[pcpa]

commit 71faba154723d8ab6d72dd0292e1f470c5b4d88a
Merge: ad994dc b6ed6ff
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date:   Sun Dec 9 13:42:08 2012 -0200

    Merge branch 'master' into f17

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