[frepple/f16: 3/4] Merge branch 'master' into f16

[Johan De Taeye]

commit 183ebddf25e43e5ccf52025465e4d7687ec85e66
Merge: 0590395 a883e14
Author: Johan De Taeye <jdetaeye at users.sourceforge.net>
Date:   Sat Sep 8 09:13:59 2012 +0200

    Merge branch 'master' into f16

 frepple.spec |   12 +++++++++---
 sources      |    2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)
---