From: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri, 2 Mar 2012 13:14:40 +0000 (-0500)
Subject: Merge branch 'layers'
X-Git-Tag: 20120702.1049~410
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f98d903b6d3bc87ecaa652596a306373597aeab6;p=profile%2Fivi%2Fweston.git

Merge branch 'layers'

I was integrating patches on the 'layers' branch and had a fixed version of
the fullscreen patch there.  My master branch had the fullscreen patch with
the resize bug, and when I pushed I meant to push the layers branch to master.

Conflicts:
	src/shell.c
---

f98d903b6d3bc87ecaa652596a306373597aeab6