Merge branch 'master' into gsoc-android-2
commit9d1590968e121fd90ae59ab8d8a3dde4d03c3e5f
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Mon, 2 Aug 2010 19:13:36 +0000 (2 21:13 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Mon, 2 Aug 2010 19:13:36 +0000 (2 21:13 +0200)
treefefc43eda6fb56bca36505fb92c487c2706f51b5
parentc74384cb775409fbed64cd1af1421da7d0207cda
parent453bc240a8044ee5668d375166186e959093f9f8
Merge branch 'master' into gsoc-android-2