Merge branch 'master' of jae.hwan.kim@165.213.180.234:/git/slp/pkgs/elementary
authorJeahwan Kim <jae.hwan.kim@samsung.com>
Fri, 29 Oct 2010 12:03:29 +0000 (21:03 +0900)
committerJeahwan Kim <jae.hwan.kim@samsung.com>
Fri, 29 Oct 2010 12:03:29 +0000 (21:03 +0900)
commitdd76a19c74e37dfdea9f8bcf57aa523d1705e68b
treef9e254f9cb3ae1d8d901e6992155ad9f47fcaf54
parent5654bee8af9e392b72da418cafcbbafb1e29fc87
parentdcf18616cdb2b46310d4f6ca9d4cff1cd0dbffe8
Merge branch 'master' of jae.hwan.kim@165.213.180.234:/git/slp/pkgs/elementary

Conflicts:
TC/tet_scen_arm
TC/tet_scen_arm