[vifir/f12/master: 17/17] Merge branch 'master' into f12

[Dave Ludlow]

commit c4c914608f43946d31181d9b55827c87de219991
Merge: 9d37518 7acec05
Author: David Ludlow <dave at adsllc.com>
Date:   Mon Mar 14 08:47:56 2011 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	sources
    	vifir.spec

 .gitignore |    2 +-
 sources    |    2 +-
 vifir.spec |   92 +++++++++++++++++++++++++++++++++++++++---------------------
 3 files changed, 62 insertions(+), 34 deletions(-)
---
diff --cc vifir.spec
index d6d57bb,4347f4a..fb58855
--- a/vifir.spec
+++ b/vifir.spec
@@@ -65,8 -72,34 +68,33 @@@ rm -rf %{buildroot
  %{_datadir}/applications/%{name}.desktop
  %{_datadir}/pixmaps/*.png
  
 -
  %changelog
- * Tue Jul 20 2010 Dave Ludlow <dave at adsllc.com> 0.7-1
+ * Mon Mar 14 2011 Dave Ludlow <dave at adsllc.com> - 0.8-1
+ - Clip airport elevations to 32,767 feet when importing X-Plane data
+ 
+ * Sun Mar 13 2011 Marek Kasik <mkasik at redhat.com> - 0.7-8
+ - Rebuild (poppler-0.16.3)
+ 
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-7
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Sun Jan 02 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.7-6
+ - rebuild (poppler)
+ 
+ * Wed Dec 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7-5
+ - rebuild (poppler)
+ 
+ * Sat Nov 06 2010 Fabian Affolter <fabian at bernewireless.net> - 0.7-4
+ - rebuild (poppler)
+ 
+ * Thu Sep 30 2010 Fabian Affolter <fabian at bernewireless.net> - 0.7-3
+ - rebuild (poppler)
+ - Duplicated variable definitions removed
+ 
+ * Thu Aug 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7-2
+ - rebuild (poppler)
+ 
+ * Tue Jul 20 2010 Dave Ludlow <dave at adsllc.com> - 0.7-1
  - Improve handling of unexpected data/conditions from the GPS
  - Improve signal-to-noise ratio on stderr output