Merge branch 'master' of git://git.openpandora.org/pandora-libraries
authorvimacs <vimacs@pndtest>
Wed, 10 Mar 2010 20:14:56 +0000 (21:14 +0100)
committervimacs <vimacs@pndtest>
Wed, 10 Mar 2010 20:14:56 +0000 (21:14 +0100)
commita50ac94b69d5ec7ea94bd5ebffe4a8e39669d32f
tree31ef21e6cf95e5cc32f3cb44f942807b23004f87
parent4748f86ceb9ba58426f5e2bb08bdf644126b5bbc
parentb94337db0358dbe71f790e4524b178d347d39371
Merge branch 'master' of git://git.openpandora.org/pandora-libraries

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