merge of 'a250ef0b1707ead866fe051ca88c56e538d51bfb'
authorJohn Lee <john_lee@openmoko.org>
Tue, 22 Jan 2008 03:52:27 +0000 (03:52 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Tue, 22 Jan 2008 03:52:27 +0000 (03:52 +0000)
commitd3432dff47d8bb0d89e6329875eba0cb28d19f71
treee83e694c91c45aca6364dc78335f9651e7a65a1c
parenta7a4c7d6f9bbcda53d3bf07d51142d41e1a4558b
parentd47eb6e254cea2207027b75b2ec071f0d3dc7d61
Merge ... 'a250ef0b1707ead866fe051ca88c56e538d51bfb'
     and 'c50c127687a0e35ba0e44fbfe9fbf7b23e973914'