From cf23d64a888528b3290881e236a0223ab81a3e2c Mon Sep 17 00:00:00 2001
From: Ton Kersten <tonk@master.tonkersten.com>
Date: Wed, 20 Feb 2013 08:42:04 +0100
Subject: [PATCH] Conflicts: 	library/setup

---
 library/setup | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/setup b/library/setup
index c42263dc2be..cfcc353ac9e 100644
--- a/library/setup
+++ b/library/setup
@@ -160,7 +160,7 @@ class Facts(object):
                       #
                       'Mandriva'     : 'Mandrake',
                       'Mandrake'     : 'Mandrake',
-		      #
+              #
                       'Solaris'      : 'Solaris',
                       'Nexenta'      : 'Solaris',
                       'OmniOS'       : 'Solaris',
@@ -168,7 +168,7 @@ class Facts(object):
                       'SmartOS'      : 'Solaris',
                       #
                       'AIX'          : 'AIX'
-	           }
+               }
 
         if self.facts['system'] == 'AIX':
             self.facts['distribution'] = 'AIX'
@@ -201,9 +201,9 @@ class Facts(object):
                         self.facts['distribution'] = name
 
         # Find the family
-	self.facts['osfamily'] = self.facts['distribution']
-	if self.facts['distribution'] in OSFAMILY:
-	   self.facts['osfamily'] = OSFAMILY[self.facts['distribution']]
+    self.facts['osfamily'] = self.facts['distribution']
+    if self.facts['distribution'] in OSFAMILY:
+       self.facts['osfamily'] = OSFAMILY[self.facts['distribution']]
 
     def get_cmdline(self):
         data = get_file_content('/proc/cmdline')