merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:13:11 +0000 (01:13 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:13:11 +0000 (01:13 +0900)
commitebb8bf5732cf18dea9124859eecedb9f665f9e70
tree0811208f11baada5e6c3fa2fc4f381d3890a694e
parentbe30583c957647d822caf845ce848774b421b254
merge with master
audio/telephony-tizen.c
packaging/bluez.spec
plugins/hciops.c
plugins/mgmtops.c
serial/proxy.c