Merge commit 'refs/merge-requests/2' of git://gitorious.org/jaffas-playground/bedside...
authorAndrew Flegg <andrew@bleb.org>
Sat, 5 Nov 2011 19:41:19 +0000 (19:41 +0000)
committerAndrew Flegg <andrew@bleb.org>
Sat, 5 Nov 2011 19:41:19 +0000 (19:41 +0000)
commit946044a06f63dc29916d6067c9eb54cb213c0da8
treec94541293123efd78e7d2b44d861917f05971761
parentc0b474130a72ca6d0183b9d11ac19deb8ec8444c
parent640571f8bcfda260d80fbba935d33815cd570f87
Merge commit 'refs/merge-requests/2' of git://gitorious.org/jaffas-playground/bedside into merge-requests/2

Conflicts:
qml/Bedside/Main.qml
qml/Bedside/Main.qml