[flaw/f14: 2/2] Merge branch 'master' into f14

[Filipe Rosset]

commit 9c827be3a94273ff23c37ace26ef99267d261883
Merge: b6b1451 e3a822d
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Thu Oct 25 15:51:02 2012 -0200

    Merge branch 'master' into f14

 flaw.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---