From: Ed Page <eopage@byu.net>
Date: Tue, 6 Apr 2010 02:52:34 +0000 (-0500)
Subject: Merge branch 'concurrent'
X-Git-Url: http://git.maemo.org/git/?p=theonering;a=commitdiff_plain;h=c67286c37961541962039babc3bcfbe0ff0d2537

Merge branch 'concurrent'
---

c67286c37961541962039babc3bcfbe0ff0d2537