Merge branch 'config-ui' into c-implementation
authorSteven Luo <steven+maemo@steven676.net>
Fri, 18 Dec 2009 10:23:12 +0000 (02:23 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Fri, 18 Dec 2009 10:23:12 +0000 (02:23 -0800)
commit60cc467a2aeddc6724f259a42f6e2bbada6fa418
tree7b073eb1423f74cab060de8891f10ee3078e2ad1
parentafc0e74b073a8fcdf5394d874306970d79b52f4a
parent69b88630149f7739221c799d7865691cc4bc2472
Merge branch 'config-ui' into c-implementation