merge of '4b30415f5d28ab66598f7324bc7a1a3f91781ed2'
authorJohn Lee <john_lee@openmoko.org>
Thu, 17 Jan 2008 09:19:46 +0000 (09:19 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Thu, 17 Jan 2008 09:19:46 +0000 (09:19 +0000)
commit4af390ca56f3037254bcddeb8c05a6f1a9751822
treea19fc34e85411d762149cc0780dfdf844d0120a9
parent357ee099c60ddf4fe162b8e24aeeba52edf4099a
parente8a60c1e518ddfeb5b5b913c3631b5daa56f6dad
Merge ... '4b30415f5d28ab66598f7324bc7a1a3f91781ed2'
     and '65fbfb9dd8770a45ce93446888e70c955e6b11d1'