[barry/f13/master: 13/13] merged with master

[Nathanael Noblet]

commit 49a8455c6e3799a2a7d953fb51ba238308d3fba4
Merge: b8912db 0278e42
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Wed Jan 26 12:07:38 2011 -0700

    merged with master

 .gitignore |    4 ++++
 barry.spec |   31 ++++++++++++++++++++++---------
 sources    |    2 +-
 3 files changed, 27 insertions(+), 10 deletions(-)
---
diff --cc barry.spec
index 66080ff,2724202..cb8e8a3
--- a/barry.spec
+++ b/barry.spec
@@@ -193,12 -190,29 +190,28 @@@ gtk-update-icon-cache %{_datadir}/icons
  %postun libs -p /sbin/ldconfig
  
  %changelog
+ * Wed Jan 26 2011 Nathanael Noblet <nathanael at gnat.ca> - 0.6.20110126git
+ - fix for bz#665648
+ 
+ * Tue Jan 18 2011 Nathanael Noblet <nathanael at gnat.ca> - 0.6.20110118git
+ - New git snapshot to fix udev acl permissions
+ 
+ * Fri Dec 31 2010 Nathanael Noblet <nathanael at gnat.ca> - 0.6.20101231git
+ - New git snapshot - essentially RC1
+ 
+ * Fri Nov 26 2010 Nathanael Noblet <nathanael at gnat.ca> - 0.6.20101126git
+ - New git snapshot
+ 
  * Thu Aug 05 2010 Nathanael Noblet <nathanael at gnat.ca> - 0.4.20100730git
- - Removed un-needed specfile conditionals
+ - Release version bump to keep upgrade path proper
+ 
+ * Thu Aug 05 2010 Nathanael Noblet <nathanael at gnat.ca> - 0.3.20100730git
+ - Version bump
  
- * Thu Jul 29 2010 Nathanael Noblet <nathanael at gnat.ca> - 0.3.20100730git
- - Rebuilt against new boost
+ * Wed Aug 04 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.2.20100329git
+ - Rebuild for Boost soname bump
+ - Update spec for guidelines and drop obsolete ifdefs 
  
 -
  * Mon Mar 29 2010 Nathanael Noblet <nathanael at gnat.ca> - 0.1.20100329git
  - Update version to include new udev rules fixing permission issue on f12
  - Fix icon and .desktop file installation