merge of '17052bfd7be914a890ec54d73c91df769727c7db'
authorJohn Lee <john_lee@openmoko.org>
Fri, 14 Mar 2008 05:56:07 +0000 (05:56 +0000)
committerJohn Lee <john_lee@openmoko.org>
Fri, 14 Mar 2008 05:56:07 +0000 (05:56 +0000)
commit28dbb186b3c0e27bb344d507056f357628b4f52e
tree3d782d8e9d6fe753680d84258b71bde3c8a1015e
parentac31db3aa881b9af9bad762aa21972e0e6f0516d
parent94cb90e09f2608595cec88d3e1497bf7b3cf5d78
Merge ... '17052bfd7be914a890ec54d73c91df769727c7db'
     and '8e540d3afdaf92d4b67de7855fe900164a9a3c69'