c530c3c Merge branch 'master' into nexenta

Merged and Committed by Joey Hess 14 years ago
    Merge branch 'master' into nexenta
    
    Conflicts:
    	debian/changelog
    	debian/rules
    
        
file added
+2
file modified
+17 -1
file modified
+15 -8
file modified
+9 -1
file modified
+6 -1
file modified
+66 -27
file modified
+5 -0
file modified
+19 -10
file modified
+2 -14
file modified
+6 -9
file modified
+1 -1
file added
+0
empty file added
file modified
+90 -0
file modified
+1 -1
file modified
+5 -3
file modified
+1 -1
file added
+2
file modified
+10 -44