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

[Jerry James]

commit d1ef19e3714a6834e7ee1c3ce15d44bd6b4cb477
Merge: 4b770dd 9f26910
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Sep 19 11:46:49 2011 -0600

    Merge branch 'master' into f14

 .gitignore     |    2 +-
 automaton.spec |   20 ++++++++++++--------
 sources        |    2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)
---