Merge branch 'master' into systemd
authorChengwei Yang <chengwei.yang@intel.com>
Thu, 15 Nov 2012 02:47:20 +0000 (10:47 +0800)
committerChengwei Yang <chengwei.yang@intel.com>
Thu, 15 Nov 2012 02:47:20 +0000 (10:47 +0800)
commit0ac2693619aef803c66abe0a089263f6efc6bc93
tree099299effe5af232d30e408f7614d3144cdebc73
parentda44f5ed91a7757baa083364c9b4e765b4f36540
parent9dc765e52ba78d3eaadabc1e34ef2ed1c41bdb52
Merge branch 'master' into systemd

Conflicts:
packaging/aul.spec

Change-Id: I9872c73c66563ea74ed3a8412595d3984d8bb479
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
packaging/aul.spec