[python-myhdl/f19: 5/5] Merge branch 'master' into f19

[Filipe Rosset]

commit 7989d534df94b2d19bd81bc8c6213dd182f8651d
Merge: 32e4582 516468d
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Tue Aug 26 23:40:16 2014 -0300

    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	python-myhdl.spec
    	sources

 .gitignore        |    1 +
 python-myhdl.spec |   16 ++++++++++------
 sources           |    2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)
---