Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sun, 18 Dec 2011 12:16:32 +0000 (21:16 +0900)
committerhudson <hudson@samsung.com>
Sun, 18 Dec 2011 12:16:32 +0000 (21:16 +0900)
commit2ad19b812a842e3549858980be1b974218963a67
treea85f80b620529c7a99abb22f7cd30de2ef51e078
parent940010f2634c9c495b0afb1f88b3ba2d80ad6722
parent8bb9335033e05c5cbc7cd205ee223502b0529d16
Merge branch 'master' into release