[glances/f17: 4/4] Merge branch 'master' into f17

[madko]

commit ce709c84e06714eb2a134febcd7b19780f66938e
Merge: e61ce84 9dbd012
Author: Edouard Bourguignon <madko at linuxed.net>
Date:   Sat Mar 16 03:59:50 2013 +0100

    Merge branch 'master' into f17
    
    Conflicts:
    	glances.spec

 .gitignore   |    1 +
 glances.spec |   19 +++++++++++++++++++
 sources      |    2 +-
 3 files changed, 21 insertions(+), 1 deletions(-)
---
diff --cc glances.spec
index 9553af1,42b0220..675b120
--- a/glances.spec
+++ b/glances.spec
@@@ -4,8 -4,8 +4,13 @@@
  %endif
  
  Name:		glances		
++<<<<<<< HEAD
 +Version:	1.5.2
 +Release:	2%{?dist}
++=======
+ Version:	1.6
+ Release:	1%{?dist}
++>>>>>>> master
  Summary:	CLI curses based monitoring tool
  
  Group:		Applications/System		
@@@ -32,7 -31,6 +37,10 @@@ It is developed in Python
  
  %prep
  %setup -q
++<<<<<<< HEAD
 +%patch0 -p1
++=======
++>>>>>>> master
  
  %build
  
@@@ -58,6 -58,12 +68,15 @@@ rm -rf %{buildroot
  %{_datadir}/man/man1/glances.1.gz
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Sat Mar 16 2013 Edouard Bourguignon <madko at linuxed.net> - 1.6-1
+ - Upgrade to 1.6
+ 
+ * Sat Feb 23 2013 Edouard Bourguignon <madko at linuxed.net> - 1.5.2-3
+ - Patch to fix bug #914837 (noSuchProcess)
+ 
++>>>>>>> master
  * Sat Jan 12 2013 Edouard Bourguignon <madko at linuxed.net> - 1.5.2-2
  - Patch to initialize y in displayMem (bug #894347)