From: Callum Lowcay <callum@callumscode.com>
Date: Wed, 12 Jan 2011 06:40:14 +0000 (+1300)
Subject: Merge branch 'master' of git://anongit.freedesktop.org/wayland
X-Git-Tag: 0.85.0~287
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9acdb50084ecdba57017ddf818e8a79f6328af13;p=profile%2Fivi%2Fwayland.git

Merge branch 'master' of git://anongit.freedesktop.org/wayland

Conflicts:
	clients/terminal.c
---

9acdb50084ecdba57017ddf818e8a79f6328af13