Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 23 Aug 2011 19:02:57 +0000 (04:02 +0900)
committerhudson <hudson@samsung.com>
Tue, 23 Aug 2011 19:02:57 +0000 (04:02 +0900)
commit257eedeed9423f8e2fc24c4fcefafaa58e6cc43d
treec69cd1b36dd534c5ef676489830c0e2b596f7a5c
parentd529d5be96198ea63b9ce27c9230a643cf6669f8
parentde26a6042345c8429e3cf4e5706f8799067f95bb
Merge branch 'master' into release