Merge branch 'gsoc-dir-split' into gsoc-android-botloader
commitc9a6bc0c05bb0c55d8d3003fa43b89a34499622d
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Mon, 26 Jul 2010 20:25:40 +0000 (26 22:25 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Mon, 26 Jul 2010 20:25:40 +0000 (26 22:25 +0200)
tree59e1ac930e7baa9f5ad50dc677e0b724a92c8255
parent2d14fa5143d6f7e715382ef2d21e2bd8b521c7cc
parentbfb90f387a8a2e24af2aa20ce60c3bb9775fcd21
Merge branch 'gsoc-dir-split' into gsoc-android-botloader