Merge commit 'johan/new-ui' into new-ui
authorDavid A. Cuadrado <krawek@gmail.com>
Tue, 29 Apr 2008 21:52:06 +0000 (16:52 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Tue, 29 Apr 2008 21:52:06 +0000 (16:52 -0500)
commit6dfcf347dbc29f79d7d4b70409e5cf07aa64b1a7
treeff3e5fdbc0ba4f003faf4f1064d41a4e4da47fad
parent2a72766ebce478e38e04cddba446dd5c4e594d71
parent1b539a4c8a78b71198a98637a128cc7d768c1c0b
Merge commit 'johan/new-ui' into new-ui