merge of '7ecf249aa01227cf559b984727eddf32c13c84a5'
authorJohn Lee <john_lee@openmoko.org>
Wed, 12 Mar 2008 06:18:23 +0000 (06:18 +0000)
committerJohn Lee <john_lee@openmoko.org>
Wed, 12 Mar 2008 06:18:23 +0000 (06:18 +0000)
commit7c162428143a230e9980879fb8d55ceb5c018a5f
tree13e5ed80cc51548e3503e7ae1367d277b6f70ad8
parentfc430305d8fc4212336eebd7a0e45e8d1df5bb6d
parent0dd6c9d399e246ba8681e36e50a3b2df2a20db3d
Merge ... '7ecf249aa01227cf559b984727eddf32c13c84a5'
     and 'ef249adf427bcb2b167f2fde790ed1627e901111'