From: skeezix <skeezix@flotsam-vm.(none)>
Date: Wed, 10 Mar 2010 20:39:06 +0000 (-0500)
Subject: Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
X-Git-Tag: Release-2010-05/1~63
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f84c9aadc1cf143e0548b2030d710b7a93a605e2;p=pandora-libraries.git

Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
Pulled from stupid git :)

Conflicts:
	testdata/scripts/pnd_run.sh
---

f84c9aadc1cf143e0548b2030d710b7a93a605e2
diff --cc testdata/scripts/pnd_run.sh
index 37ef213,c663cbe..ae10e32
mode 100644,100755..100644
--- a/testdata/scripts/pnd_run.sh
+++ b/testdata/scripts/pnd_run.sh
@@@ -247,10 -242,10 +242,10 @@@ f
  } #function end!
  
  if [ $nox ]; then
- echo forking now!
- fork &> /tmp/pndrun$BASENAME$mount.out & 
- disown
+ 	echo forking now!
+ 	fork &> /tmp/pndrun$BASENAME$mount.out & 
+ 	disown
  else
- echo Running with x, not disowning!
- fork &> /tmp/pndrun$BASENAME$mount.out
- fi
+ 	echo Running with x, not disowning!
+ 	fork &> /tmp/pndrun$BASENAME$mount.out
 -fi
++fi