merge of '20657a67dd3d46190016de2069fb77e48b12f0b9'
authorJohn Lee <john_lee@openmoko.org>
Fri, 29 Feb 2008 13:13:00 +0000 (13:13 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Fri, 29 Feb 2008 13:13:00 +0000 (13:13 +0000)
commit92e199ae577377e41e92ddd4b0c58227502a04c5
treecfa245f65d7e3398e485bd476a8da0f890369548
parentf87430bac06825f8b9b0d4371705e9b9cf7bcfe2
parent3649f62fb0080fecd8f55d520a7d58bcff15b95e
Merge ... '20657a67dd3d46190016de2069fb77e48b12f0b9'
     and '3d4d513f672a93f1547b3a1f5288ad83d6fc141b'