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

[Nathanael Noblet]

commit 3c4780433e6e07dead01edf28afa6ca288fe2565
Merge: 3300667 e5b221b
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Mon Feb 14 13:48:11 2011 -0700

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

 barry.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---