From: Andrew Flegg <andrew@bleb.org>
Date: Tue, 8 Jun 2010 23:06:32 +0000 (+0100)
Subject: Merge branch 'master' of git@83.233.175.44:hermes
X-Git-Tag: 0.8.0~29^2~2
X-Git-Url: https://vcs.maemo.org/git/?p=hermes;a=commitdiff_plain;h=29ce85c325646c519f25c9dcfb6245cffbe1e5e3

Merge branch 'master' of git@83.233.175.44:hermes

Conflicts:

	package/src/org/maemo/hermes/engine/linkedin/api.py
---

29ce85c325646c519f25c9dcfb6245cffbe1e5e3