pandora-libraries.git
14 years agoMerge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
skeezix [Wed, 10 Mar 2010 20:39:06 +0000 (15:39 -0500)]
Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
Pulled from stupid git :)

Conflicts:
testdata/scripts/pnd_run.sh

14 years agolots of changes for minimenu; wrap options, clock, caching options
skeezix [Wed, 10 Mar 2010 20:34:45 +0000 (15:34 -0500)]
lots of changes for minimenu; wrap options, clock, caching options

14 years agofixed check for running x
vimacs [Wed, 10 Mar 2010 20:20:25 +0000 (21:20 +0100)]
fixed check for running x
modified:   testdata/scripts/pnd_run.sh

14 years agorestructured script a bit, fixed ordering a bit, umounting should be slightly faster
vimacs [Wed, 10 Mar 2010 20:16:26 +0000 (21:16 +0100)]
restructured script a bit, fixed ordering a bit, umounting should be slightly faster
also see last commit
modified:   testdata/scripts/pnd_run.sh

14 years agoMerge branch 'master' of git://git.openpandora.org/pandora-libraries
vimacs [Wed, 10 Mar 2010 20:14:56 +0000 (21:14 +0100)]
Merge branch 'master' of git://git.openpandora.org/pandora-libraries

Conflicts:
testdata/scripts/pnd_run.sh

14 years agoFixed pnd_run.sh so -m and -u work, yay for previewpics
skeezix [Wed, 10 Mar 2010 17:30:26 +0000 (12:30 -0500)]
Fixed pnd_run.sh so -m and -u work, yay for previewpics

14 years agommenu now uses real app conf (desktop.searchpath) for apps; will add menu searchpath...
skeezix [Wed, 10 Mar 2010 17:27:26 +0000 (12:27 -0500)]
mmenu now uses real app conf (desktop.searchpath) for apps; will add menu searchpath in a bit
previewpics (deferred load) now work fine with new pnd_run.sh (to come), woowoo

14 years agoshould work
vimacs [Wed, 10 Mar 2010 17:27:08 +0000 (18:27 +0100)]
should work
modified:   testdata/sh/sudoers

14 years agofixed detaching/destroying of loop devices.
vimacs [Wed, 10 Mar 2010 17:26:14 +0000 (18:26 +0100)]
fixed detaching/destroying of loop devices.
nox mode when no x is running wont start x anymore
modified:   testdata/scripts/pnd_run.sh

14 years agoadded ln
vimacs [Wed, 10 Mar 2010 15:41:31 +0000 (16:41 +0100)]
added ln
modified:   testdata/sh/sudoers

14 years agoUpdating pnd_run.sh for vimacs
skeezix [Wed, 10 Mar 2010 15:36:43 +0000 (10:36 -0500)]
Updating pnd_run.sh for vimacs

14 years agoMerge branch 'master' of git://git.openpandora.org/pandora-libraries
vimacs [Wed, 10 Mar 2010 15:31:53 +0000 (16:31 +0100)]
Merge branch 'master' of git://git.openpandora.org/pandora-libraries

14 years ago modified: testdata/scripts/pnd_run.sh
vimacs [Wed, 10 Mar 2010 15:31:31 +0000 (16:31 +0100)]
modified:   testdata/scripts/pnd_run.sh

14 years agoChanged PXML so 'no_x' option is now 'x11', with option req/stop/ignore
skeezix [Wed, 10 Mar 2010 15:28:47 +0000 (10:28 -0500)]
Changed PXML so 'no_x' option is now 'x11', with option req/stop/ignore
Changed mmenu to suppress apps that require x11, when x11 is not running

14 years agoMerge branch 'master' of git://git.openpandora.org/pandora-libraries
vimacs [Wed, 10 Mar 2010 15:23:32 +0000 (16:23 +0100)]
Merge branch 'master' of git://git.openpandora.org/pandora-libraries

14 years agoSome ugly smarter mounting, making sure we done use more loop devices then enccesairy...
vimacs [Wed, 10 Mar 2010 15:22:02 +0000 (16:22 +0100)]
Some ugly smarter mounting, making sure we done use more loop devices then enccesairy, fixed loop cleanup
modified:   testdata/scripts/pnd_run.sh

14 years agoFix for deployment
skeezix [Tue, 9 Mar 2010 21:13:37 +0000 (16:13 -0500)]
Fix for deployment

14 years agoLots of changes/additions for minimenu
skeezix [Tue, 9 Mar 2010 21:10:14 +0000 (16:10 -0500)]
Lots of changes/additions for minimenu
- shows a menu when you hit Start now (so you can shutdown, or chang environments)
Commented out some debugging I'd recently added to libpnd proper

14 years agoCategory scroll offscreen left/right added
skeezix [Tue, 9 Mar 2010 17:42:42 +0000 (12:42 -0500)]
Category scroll offscreen left/right added
Conf file now instructs which of the 6 categories to use (main, main sub1, main sub2, and the alt 3 as well); default is main and alt only (no subs)

14 years agoUpdated makefile to lessen the breakage of image :)
skeezix [Tue, 9 Mar 2010 17:03:54 +0000 (12:03 -0500)]
Updated makefile to lessen the breakage of image :)

14 years agoFix so preview pics will scale correctly
skeezix [Tue, 9 Mar 2010 16:28:10 +0000 (11:28 -0500)]
Fix so preview pics will scale correctly

14 years agoMinor cleanups; possibly fixed Makefile for djw and mmenu
skeezix [Tue, 9 Mar 2010 15:30:06 +0000 (10:30 -0500)]
Minor cleanups; possibly fixed Makefile for djw and mmenu

14 years agoAdded GPLv2 license to minimenu
skeezix [Mon, 8 Mar 2010 21:48:21 +0000 (16:48 -0500)]
Added GPLv2 license to minimenu

14 years agoFirst checkin of Minimenu
skeezix [Mon, 8 Mar 2010 21:05:29 +0000 (16:05 -0500)]
First checkin of Minimenu

14 years agoAdded 'apps' dir to menu, so it goes with out posted goals of emitting to both deskto...
skeezix [Sat, 6 Mar 2010 04:52:45 +0000 (23:52 -0500)]
Added 'apps' dir to menu, so it goes with out posted goals of emitting to both desktop and menu
This has been bandied about for months, time to commit it :)

14 years agoAdded NORUN option to pnd_apps_exec, which goes as far as pnd_run but then skips...
skeezix [Sat, 6 Mar 2010 04:32:07 +0000 (23:32 -0500)]
Added NORUN option to pnd_apps_exec, which goes as far as pnd_run but then skips it. It records the pnd_run.sh
line to a buffer, which can then be retrieved. Thus, an app can find out how to run an app without depending on
pnd_apps_exec to actually run it.

14 years agoOnly merge overrides if the caller specifies override searchpath
skeezix [Sat, 6 Mar 2010 04:31:05 +0000 (23:31 -0500)]
Only merge overrides if the caller specifies override searchpath

14 years agoAdded get_size() func
skeezix [Sat, 6 Mar 2010 04:30:28 +0000 (23:30 -0500)]
Added get_size() func

14 years agoAdded _get_as_int_d function, which is same as _get_as_int but with default value...
skeezix [Sat, 6 Mar 2010 04:29:35 +0000 (23:29 -0500)]
Added _get_as_int_d function, which is same as _get_as_int but with default value (instead of returning BADNUM)

14 years agoMerge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
skeezix [Sat, 6 Mar 2010 04:28:30 +0000 (23:28 -0500)]
Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries

14 years agoLimit how far we can backseek through a pnd-file
skeezix [Sat, 6 Mar 2010 04:27:30 +0000 (23:27 -0500)]
Limit how far we can backseek through a pnd-file

14 years agoMerge branch 'master' of git://git.openpandora.org/pandora-libraries
vimacs [Fri, 5 Mar 2010 15:40:45 +0000 (16:40 +0100)]
Merge branch 'master' of git://git.openpandora.org/pandora-libraries

14 years agoOnly forking when killing x.
vimacs [Fri, 5 Mar 2010 15:39:59 +0000 (16:39 +0100)]
Only forking when killing x.
modified:   testdata/scripts/pnd_run.sh

14 years agoAdded some basic pandora-logos to libpnd for people to use.. thanks ED :)
skeezix [Fri, 5 Mar 2010 02:30:05 +0000 (21:30 -0500)]
Added some basic pandora-logos to libpnd for people to use.. thanks ED :)

14 years agodoh.
skeezix [Fri, 5 Mar 2010 02:01:41 +0000 (21:01 -0500)]
doh.

14 years agowaitpid() instead of wait() in mount, unmount, and exec of pnds
skeezix [Fri, 5 Mar 2010 01:41:38 +0000 (20:41 -0500)]
waitpid() instead of wait() in mount, unmount, and exec of pnds

14 years agoMinor fix for config parsing, eliminates some prelude spacing on value form key/value...
skeezix [Fri, 5 Mar 2010 01:35:36 +0000 (20:35 -0500)]
Minor fix for config parsing, eliminates some prelude spacing on value form key/value pairs
minor change to notifyd's help message

14 years agoFix for getting .de when you wanted .en for example.. slightly better(?) isolang...
skeezix [Tue, 2 Mar 2010 04:07:13 +0000 (23:07 -0500)]
Fix for getting .de when you wanted .en for example.. slightly better(?) isolang best matcher

14 years agoAdding argument support to PXML; pnd_run.sh already had it, but PXML did not.
skeezix [Tue, 2 Mar 2010 03:38:35 +0000 (22:38 -0500)]
Adding argument support to PXML; pnd_run.sh already had it, but PXML did not.
In the Exec tag you can now specify args to pass, save you making sh-scripts in the pnd a lot of the time

14 years agoMinor debugging added; turns out a bug I tracked for hours was... a bad SDHC card :(
skeezix [Tue, 2 Mar 2010 03:08:12 +0000 (22:08 -0500)]
Minor debugging added; turns out a bug I tracked for hours was... a bad SDHC card :(

14 years agoSlightly larger icon read/write buffer
skeezix [Mon, 1 Mar 2010 05:01:53 +0000 (00:01 -0500)]
Slightly larger icon read/write buffer

14 years agoReduce over-icon-generation due to multiapps
skeezix [Mon, 1 Mar 2010 04:34:02 +0000 (23:34 -0500)]
Reduce over-icon-generation due to multiapps

14 years agoLarge change, to support multiple applications within a single PXML.xml file.
skeezix [Mon, 1 Mar 2010 03:52:09 +0000 (22:52 -0500)]
Large change, to support multiple applications within a single PXML.xml file.
genpxml script was updated to generate properly formed new XML
test apps were updated to comply
pnd_run will attempt to run all subapps right now, for lack of a better idea :)
pndnotifyd will generate all the icons and .desktop files for all subapps, and it should all work

14 years agoI too can mistype!
skeezix [Sat, 27 Feb 2010 02:15:45 +0000 (21:15 -0500)]
I too can mistype!

14 years agoAdded definition of 'affirmative' for bools in PXML
skeezix [Sat, 27 Feb 2010 02:13:43 +0000 (21:13 -0500)]
Added definition of 'affirmative' for bools in PXML
Added cpu-speed setting for app-exec and .desktop->Exec

14 years agosleepyhead :)
skeezix [Sat, 27 Feb 2010 02:03:00 +0000 (21:03 -0500)]
sleepyhead :)

14 years agodoh...
vimacs [Sat, 27 Feb 2010 01:33:15 +0000 (02:33 +0100)]
doh...
modified:   ../testdata/scripts/pnd_run.sh

14 years agoChange cpu clock [-c] stub
vimacs [Fri, 26 Feb 2010 12:47:37 +0000 (13:47 +0100)]
Change cpu clock [-c] stub
modified:   testdata/scripts/pnd_run.sh

14 years agolowered time for killist from 3 to 1 sec
vimacs [Fri, 26 Feb 2010 12:39:37 +0000 (13:39 +0100)]
lowered time for killist from 3 to 1 sec
modified:   testdata/scripts/op_menu.sh

14 years agoMake libpnd a little more tolerant of padding at end of PXML, when looking for icon
skeezix [Thu, 25 Feb 2010 16:00:11 +0000 (11:00 -0500)]
Make libpnd a little more tolerant of padding at end of PXML, when looking for icon

14 years agomoved umount union to section without noexec, noexec prevents aufs from working
vimacs [Thu, 18 Feb 2010 21:17:36 +0000 (22:17 +0100)]
moved umount union to section without noexec, noexec prevents aufs from working
modified:   testdata/sh/sudoers

14 years agoAdded shutdown warning/timer.
vimacs [Thu, 18 Feb 2010 18:29:00 +0000 (19:29 +0100)]
Added shutdown warning/timer.
modified:   testdata/scripts/op_power.sh

14 years agoThere may have been a bug preventing the pidlist to display which could be fixed...
vimacs [Thu, 18 Feb 2010 17:44:12 +0000 (18:44 +0100)]
There may have been a bug preventing the pidlist to display which could be fixed now :-)
modified:   testdata/scripts/op_menu.sh

14 years agochanged cpu resume from -ge 14 to -gt 14
vimacs [Thu, 18 Feb 2010 17:07:51 +0000 (18:07 +0100)]
changed cpu resume from -ge 14 to -gt 14
modified:   testdata/scripts/op_power.sh

14 years agofixed typo
root [Thu, 18 Feb 2010 16:59:31 +0000 (17:59 +0100)]
fixed typo
modified:   testdata/scripts/op_power.sh

14 years agoFixed conf for vimacs new script
skeezix [Thu, 18 Feb 2010 16:31:42 +0000 (11:31 -0500)]
Fixed conf for vimacs new script

14 years agoProper wl initfile name
vimacs [Thu, 18 Feb 2010 16:27:56 +0000 (17:27 +0100)]
Proper wl initfile name
modified:   testdata/scripts/op_power.sh

14 years ago new file: testdata/scripts/op_battlow.sh
vimacs [Thu, 18 Feb 2010 16:25:55 +0000 (17:25 +0100)]
new file:   testdata/scripts/op_battlow.sh

14 years agoPower down/up bt and wl
vimacs [Thu, 18 Feb 2010 15:22:01 +0000 (16:22 +0100)]
Power down/up bt and wl
modified:   testdata/scripts/op_power.sh

14 years agocheck if statefile exists
vimacs [Thu, 18 Feb 2010 15:20:25 +0000 (16:20 +0100)]
check if statefile exists
modified:   testdata/scripts/op_power.sh

14 years agoMerge branch 'master' of git://git.openpandora.org/pandora-libraries
vimacs [Thu, 18 Feb 2010 14:53:08 +0000 (15:53 +0100)]
Merge branch 'master' of git://git.openpandora.org/pandora-libraries

14 years agonew standby script
vimacs [Thu, 18 Feb 2010 14:52:28 +0000 (15:52 +0100)]
new standby script
modified:   testdata/scripts/op_power.sh

14 years agoAnd lets only do critical shutdown when a script is specified, shall we :)
skeezix [Thu, 18 Feb 2010 03:28:16 +0000 (22:28 -0500)]
And lets only do critical shutdown when a script is specified, shall we :)

14 years agoAdded critical battery level forced shutdown .. calls script when battery gets to...
skeezix [Thu, 18 Feb 2010 03:26:04 +0000 (22:26 -0500)]
Added critical battery level forced shutdown .. calls script when battery gets to (say) 1%
configured in evmapper conf

14 years agoAdded basic LED stuff to libpnd pnd_device
skeezix [Thu, 18 Feb 2010 03:07:38 +0000 (22:07 -0500)]
Added basic LED stuff to libpnd pnd_device
Added blink-timer to evmapperd .. low battery causes blink! cute!

14 years agoEvtest added (from beagleboard guys, just copied in for convenience)
skeezix [Wed, 17 Feb 2010 22:18:28 +0000 (17:18 -0500)]
Evtest added (from beagleboard guys, just copied in for convenience)
evmapperd properly detects power button now .. so can now do lid, power, and pandora-menu buttons
... soon to add power level blinking

14 years agoZombie.
skeezix [Wed, 17 Feb 2010 20:10:58 +0000 (15:10 -0500)]
Zombie.

14 years agoAdded anit-zombie measures to evmapperd
skeezix [Wed, 17 Feb 2010 19:28:47 +0000 (14:28 -0500)]
Added anit-zombie measures to evmapperd

14 years agofixed
vimacs [Wed, 17 Feb 2010 17:04:19 +0000 (18:04 +0100)]
fixed
modified:   testdata/scripts/op_lid.sh
modified:   testdata/scripts/op_menu.sh

14 years agoRemember old brightnes, dont use op_bright.sh
vimacs [Wed, 17 Feb 2010 12:14:54 +0000 (13:14 +0100)]
Remember old brightnes, dont use op_bright.sh
modified:   testdata/scripts/op_lid.sh

14 years agoMerge branch 'master' of git://git.openpandora.org/pandora-libraries
vimacs [Wed, 17 Feb 2010 11:35:33 +0000 (12:35 +0100)]
Merge branch 'master' of git://git.openpandora.org/pandora-libraries

14 years agoSwitched to su -c instead of sudo.
vimacs [Wed, 17 Feb 2010 11:34:19 +0000 (12:34 +0100)]
Switched to su -c instead of sudo.
modified:   testdata/scripts/op_menu.sh

14 years agoAdded a lame but working dbus watch ability..
skeezix [Tue, 16 Feb 2010 17:51:57 +0000 (12:51 -0500)]
Added a lame but working dbus watch ability..
-- dbus can watch insert/eject
-- inotify can watch file moves
-- etc/pandora/conf/apps notify list removed /media (was catching the OS, since fw mounted to /media/mmcblk0p1 when boot off SD!)
-- dbusnotifytest seems to work on desktop and panda
Working much better, catches every insert/eject just fine, without spamming

14 years agoAnother minor, useless change.
skeezix [Tue, 16 Feb 2010 04:43:18 +0000 (23:43 -0500)]
Another minor, useless change.

14 years agoMore logging in pnd_notify
skeezix [Tue, 16 Feb 2010 01:19:37 +0000 (20:19 -0500)]
More logging in pnd_notify

14 years agoMinor changes, all commented out; bloody inotify.
skeezix [Tue, 16 Feb 2010 01:14:23 +0000 (20:14 -0500)]
Minor changes, all commented out; bloody inotify.

14 years agoMerge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
skeezix [Mon, 15 Feb 2010 19:29:48 +0000 (14:29 -0500)]
Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries

14 years agoAdded a param to inotify flags; seems to detect removal of SDs much better now
skeezix [Mon, 15 Feb 2010 19:28:52 +0000 (14:28 -0500)]
Added a param to inotify flags; seems to detect removal of SDs much better now

14 years agoMerge branch 'master' of git://git.openpandora.org/pandora-libraries
vimacs [Mon, 15 Feb 2010 18:52:03 +0000 (19:52 +0100)]
Merge branch 'master' of git://git.openpandora.org/pandora-libraries

14 years ago modified: testdata/scripts/op_menu.sh
vimacs [Mon, 15 Feb 2010 18:51:31 +0000 (19:51 +0100)]
modified:   testdata/scripts/op_menu.sh

14 years agoAdded 'seconds since first log line' to pnd_logger
skeezix [Mon, 15 Feb 2010 18:49:18 +0000 (13:49 -0500)]
Added 'seconds since first log line' to pnd_logger
pndnotifyd should now ignore a rediscover request within 2s of past one, maybe avoid a few 'redraws'

14 years agoAdded pnd_info.c since I'm an idiot
skeezix [Mon, 15 Feb 2010 14:54:55 +0000 (09:54 -0500)]
Added pnd_info.c since I'm an idiot

14 years agoMakefile rule, copy pnd_info into deployment tree
skeezix [Mon, 15 Feb 2010 14:45:05 +0000 (09:45 -0500)]
Makefile rule, copy pnd_info into deployment tree

14 years agoMinor fixes for a couple 'uninitialized vars' that gcc here wasn't informing me of :)
skeezix [Mon, 15 Feb 2010 14:41:47 +0000 (09:41 -0500)]
Minor fixes for a couple 'uninitialized vars' that gcc here wasn't informing me of :)

14 years agoAdded -l option to pndevmapperd, same as in pndnotifyd
skeezix [Mon, 15 Feb 2010 04:19:38 +0000 (23:19 -0500)]
Added -l option to pndevmapperd, same as in pndnotifyd
Previous push, added pnd_info for userland inspection of PXML.xml -- say user wants to know how to install an app or something

14 years agopndnotifyd logging was already available (just drop the -d on command line, and redir...
skeezix [Mon, 15 Feb 2010 03:31:02 +0000 (22:31 -0500)]
pndnotifyd logging was already available (just drop the -d on command line, and redirect to file; log level was in conf file..)
 -- but now you can just add -l to command line to cause it to go go debuglevel and spit out to /tmp/pndnotifyd.log
 -- can actualyl do -l#, where # is log level, default is 0 (all)

pnd_logger now has set_buried_logging() which lets you turn on logging in libpnd API that doesn't normally log, such as
the discovery code; this way we can log some deep-shit, if we really want to

14 years agoAdded <mkdir> to PXML.xml wherein pndnotifyd will attempt to create some directories...
skeezix [Sun, 14 Feb 2010 05:05:47 +0000 (00:05 -0500)]
Added <mkdir> to PXML.xml wherein pndnotifyd will attempt to create some directories on the SD card hosting the pnd-file, when directed to.
Shoudl be used sparingly, bt coudl be handy for guiding user to a needed path, or implying canonicle paths

14 years agofixed x restarting, last commit fixed a bug that didnt exist in that way...
vimacs [Sat, 13 Feb 2010 12:26:03 +0000 (13:26 +0100)]
fixed x restarting, last commit fixed a bug that didnt exist in that way...
modified:   testdata/scripts/pnd_run.sh

14 years agodetaching and killing x should work now, maybe
vimacs [Sat, 13 Feb 2010 12:19:58 +0000 (13:19 +0100)]
detaching and killing x should work now, maybe
modified:   testdata/scripts/pnd_run.sh

14 years agoadded -j, join | mounts aditional folder into the union
vimacs [Tue, 9 Feb 2010 21:10:01 +0000 (22:10 +0100)]
added -j, join | mounts aditional folder into the union
modified:   testdata/scripts/pnd_run.sh

14 years agoop_lidtoggle.sh > op_lid.sh
vimacs [Sun, 10 Jan 2010 15:03:33 +0000 (16:03 +0100)]
op_lidtoggle.sh > op_lid.sh
modified:   deployment/etc/pandora/conf/eventmap

14 years ago modified: testdata/scripts/op_menu.sh
vimacs [Fri, 8 Jan 2010 07:19:15 +0000 (08:19 +0100)]
modified:   testdata/scripts/op_menu.sh

14 years agofixed sudoers?
vimacs [Thu, 31 Dec 2009 03:13:31 +0000 (04:13 +0100)]
fixed sudoers?
modified:   testdata/sh/sudoers

14 years ago modified: testdata/scripts/op_power.sh
vimacs [Thu, 31 Dec 2009 02:32:13 +0000 (03:32 +0100)]
modified:   testdata/scripts/op_power.sh

14 years ago modified: testdata/scripts/op_lid.sh
vimacs [Thu, 31 Dec 2009 02:02:05 +0000 (03:02 +0100)]
modified:   testdata/scripts/op_lid.sh

14 years ago new file: testdata/scripts/op_lid.sh
vimacs [Thu, 31 Dec 2009 01:59:34 +0000 (02:59 +0100)]
new file:   testdata/scripts/op_lid.sh

14 years agoFixed op_menu if no x is running and added screen poweroff and cpu slowdown to power...
vimacs [Sat, 26 Dec 2009 21:28:02 +0000 (22:28 +0100)]
Fixed op_menu if no x is running and added screen poweroff and cpu slowdown to power button script
modified:   testdata/scripts/op_menu.sh
modified:   testdata/scripts/op_power.sh

14 years agoadded op_power, untested!
vimacs [Sat, 26 Dec 2009 21:14:48 +0000 (22:14 +0100)]
added op_power, untested!
new file:   testdata/scripts/op_power.sh

14 years agoFixed sudoers so exec on aufs doesnt fail.
vimacs [Sat, 26 Dec 2009 10:45:10 +0000 (11:45 +0100)]
Fixed sudoers so exec on aufs doesnt fail.
modified:   testdata/sh/sudoers

14 years agoMerge branch 'master' of git://git.openpandora.org/pandora-libraries
vimacs [Fri, 25 Dec 2009 16:47:07 +0000 (17:47 +0100)]
Merge branch 'master' of git://git.openpandora.org/pandora-libraries