Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 20 Dec 2011 04:23:41 +0000 (13:23 +0900)
committerhudson <hudson@samsung.com>
Tue, 20 Dec 2011 04:23:41 +0000 (13:23 +0900)
commit8e486001f2569fc8f96ae162ca54342fbe1a947b
treee6b7eed437b4216e75418d76ba383d1bd65c62c2
parentdcfc31408a67782f131056a66e8912f46e98efcc
parentc37c12189420889cf0edf1400a24b235a4ad054d
Merge branch 'master' into release