[common] control and layout/ are no longer mutually exclusive. ./control takes precedence over ./layout/DEBIAN/control.

From: Dustin L. Howett <dustin@howett.net>

git-svn-id: http://svn.howett.net/svn/theos/trunk@606 4410221e-0ddf-4ce3-99c0-2db6c0dbc727