[barry/f14/master: 2/2] merge master

[Nathanael Noblet]

commit 3332f8abd4c48e09d0a6122ac815229d595e7eb8
Merge: acdccaa 6579f40
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Wed Jan 26 11:47:02 2011 -0700

    merge master

 .gitignore |    1 +
 barry.spec |    9 ++++++---
 sources    |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --cc barry.spec
index e120626,de15a71..c7fddf1
--- a/barry.spec
+++ b/barry.spec
@@@ -13,8 -13,7 +13,8 @@@ URL:            http://www.netdirect.ca
  # ./git-extract.sh 0 15 master
  # (cd build/barry* && ../../tar-prepare.sh)
  # (cd build && ../tar-create.sh 0 15)
 +BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- Source0:        %{name}-20110118.%{version}.tar.bz2
+ Source0:        %{name}-20110126.%{version}.tar.bz2
  
  BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel
  BuildRequires:  libglademm24-devel libglade2-devel libtar-devel libtool