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

Pulled from stupid git :)

Conflicts:
	testdata/scripts/pnd_run.sh

diff --cc testdata/scripts/pnd_run.sh
index 37ef213,c663cbe..ae10e32
mode 100644,100755..100644
--- 1/testdata/scripts/pnd_run.sh
--- 2/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