[barry/f14/master: 2/2] Merge remote-tracking branch 'origin/master' into f14

[Nathanael Noblet]

commit 4e774381c7ab4b020a28c253fa37a9ac4af6efc2
Merge: afd85af 0e034db
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Fri Mar 4 09:41:15 2011 -0700

    Merge remote-tracking branch 'origin/master' into f14

 .gitignore |    1 +
 barry.spec |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---