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

[Jerry James]

commit 4b770dde7b90e9759d7df0c49a777b4ae4efbc8a
Merge: cd9752f 41bedc8
Author: Jerry James <loganjerry at gmail.com>
Date:   Wed Mar 30 10:38:03 2011 -0600

    Merge branch 'master' into f14

 .gitignore     |    2 +-
 automaton.spec |    5 ++++-
 sources        |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---