merge of 'acaec69cff5e01d75fc25fc008a3647d4276e23a'
authorJohn Lee <john_lee@openmoko.org>
Fri, 1 Feb 2008 12:07:19 +0000 (12:07 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Fri, 1 Feb 2008 12:07:19 +0000 (12:07 +0000)
commit7d064c645c5b5daae85751a5a2f40a1a6c7acf88
treeffd3b583fef0424a868a583b3e7637ce27273141
parent27962f88f5dc05c9326024629aeb9c0255ff42bc
parent84821df6d7ea32309ace6906891501dcd61a588e
Merge ... 'acaec69cff5e01d75fc25fc008a3647d4276e23a'
     and 'fbdf8a106f5161fd714dd92d53cf8bd31fa6d8ea'