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

[Nathanael Noblet]

commit afd85af0e25c0f17d0ea8cb032da2f330b466386
Merge: 3c47804 bd0ba99
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Wed Feb 16 10:36:16 2011 -0700

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

 barry.spec |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)
---