Merge branch 'master' of git://gitorious.org/webos-internals/applications
authorZuchmir2 <Zuchmir2@gmail.com>
Fri, 24 Jul 2009 05:40:11 +0000 (01:40 -0400)
committerZuchmir2 <Zuchmir2@gmail.com>
Fri, 24 Jul 2009 05:40:11 +0000 (01:40 -0400)
commit94cf9f79e6d1ba702463fc87f57b13a539a4a48a
treeb82b34180f9f638656b44e2df2422785b7d79282
parentd328feee62d96df4bd2ec0f6c918532a76b698b0
parentdbd07950b75a5ca517f4d16fa370fd649e193790
Merge branch 'master' of git://gitorious.org/webos-internals/applications

Conflicts:
termplugin/fontinfo.hpp
termplugin/termplugin.cpp
termplugin/fontinfo.hpp
termplugin/termplugin.cpp