Merge branch 'systemd'
authorJacek Migacz <j.migacz@samsung.com>
Tue, 4 Dec 2012 08:59:17 +0000 (09:59 +0100)
committerJacek Migacz <j.migacz@samsung.com>
Tue, 4 Dec 2012 09:00:39 +0000 (10:00 +0100)
Conflicts:
packaging/system-server.spec

Change-Id: I396eccf32a949ef0baca7c4bf460a338492ba281

1  2 
packaging/system-server.spec

Simple merge