Merge branch 'master' of ssh://gitorious.org/webos-internals/applications
authorRyan Hope <rmh3093@Redman.buffalo.rr.com>
Mon, 17 Aug 2009 19:02:37 +0000 (15:02 -0400)
committerRyan Hope <rmh3093@Redman.buffalo.rr.com>
Mon, 17 Aug 2009 19:02:37 +0000 (15:02 -0400)
commit179d4f8ea4288ef0ed93132fb47028a38b28bf11
tree80c6d1601607742eeaef0ac881fb4587f296783d
parentb836614051b96aa105b647b46e3ed12a4744a340
parent26f4c6685f25b7cb4b83e31c0cd686953f315b0e
Merge branch 'master' of ssh://gitorious.org/webos-internals/applications

Conflicts:
ipkgservice/org.webosinternals.ipkgservice.jar
ipkgservice/org/webosinternals/ipkgservice/IPKGService.java