Merge branch 'master' of git@gitorious.org:webos-internals/applications.git
authorpregame <jostster@gmail.com>
Sat, 27 Jun 2009 05:11:16 +0000 (22:11 -0700)
committerpregame <jostster@gmail.com>
Sat, 27 Jun 2009 05:11:16 +0000 (22:11 -0700)
commit7022da30bf1085fa76994ceada2fad3f67f4faef
treeed72badccbaab7914c6a8ce81b70090de3ab74af
parent098f5ee607fc842a0db838c07685ce978f5d3037
parent1e1902a6fd59a88dc5602a8d446b2781331c6935
Merge branch 'master' of git@gitorious.org:webos-internals/applications.git

Conflicts:
org.webosinternals.services/Makefile