Merge remote-tracking branch 'origin/master' into obi
authorChang.H.S <jhs@dev3>
Wed, 12 Dec 2012 10:11:27 +0000 (19:11 +0900)
committerChang.H.S <jhs@dev3>
Wed, 12 Dec 2012 10:11:27 +0000 (19:11 +0900)

Trivial merge