Merge branches 'master' and 'obi' into obi
authorChang.H.S <jhs@dev3>
Mon, 10 Dec 2012 08:24:49 +0000 (17:24 +0900)
committerChang.H.S <jhs@dev3>
Mon, 10 Dec 2012 08:24:49 +0000 (17:24 +0900)

Trivial merge