Merge branch 'master' of git@83.233.175.44:hermes

author Andrew Flegg <andrew@bleb.org>

Tue, 8 Jun 2010 23:06:32 +0000 (00:06 +0100)

committer Andrew Flegg <andrew@bleb.org>

Tue, 8 Jun 2010 23:06:32 +0000 (00:06 +0100)
author Andrew Flegg <andrew@bleb.org>
Tue, 8 Jun 2010 23:06:32 +0000 (00:06 +0100)
committer Andrew Flegg <andrew@bleb.org>
Tue, 8 Jun 2010 23:06:32 +0000 (00:06 +0100)
diff --cc package/src/org/maemo/hermes/engine/linkedin/api.py
Simple merge
author	Andrew Flegg <andrew@bleb.org>
	Tue, 8 Jun 2010 23:06:32 +0000 (00:06 +0100)
committer	Andrew Flegg <andrew@bleb.org>
	Tue, 8 Jun 2010 23:06:32 +0000 (00:06 +0100)