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

[Nathanael Noblet]

commit 3300667c4f2b47a0eb0e5aa05d20537ce942677a
Merge: 870b2f3 9f5648e
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Mon Feb 14 12:33:55 2011 -0700

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

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