Merge branches 'HEAD' and 'tztv_2.2' kdbus-dev
authorSemun Lee <sm79.lee@samsung.com>
Wed, 15 Jan 2014 02:06:33 +0000 (11:06 +0900)
committerSemun Lee <sm79.lee@samsung.com>
Wed, 15 Jan 2014 02:06:33 +0000 (11:06 +0900)

Trivial merge