Граф коммитов

580 Коммитов

Автор SHA1 Сообщение Дата
Reuben Morais af525c4313 Bug 772524 - Fix "data argument not used by format string" warnings in smslib.mm. r=mounir 2012-07-10 18:31:04 -04:00
Reuben Morais 0bc9bee885 Bug 772351 - Fix deprecated writable strings warnings on smslib.mm. r=mounir 2012-07-10 18:31:04 -04:00
Gene Lian 77e62ee33f Bug 749551 - Alarm API (Hal/Gonk). r=cjones 2012-07-06 12:42:10 +02:00
Kan-Ru Chen 8521c6d695 Bug 768364 - Clear sLockTable on shutdown r=jlebar 2012-07-06 10:09:46 +08:00
Ed Morley e73ef45549 Backout 1dba66cfad9a, ed768b821da1, 23fd9a8d0c9a, 1e90805d96aa, 07425f0e921e (bug 749551) for M3 failures 2012-07-03 11:23:54 +01:00
Gene Lian cad479cbe7 Bug 749551 - Alarm API (Hal/Gonk). r=cjones 2012-07-03 11:24:13 +02:00
Justin Lebar 6ff2cb6e6b Bug 769585 - Fix vim modelines. DONTBUILD rs=mrbkap 2012-06-29 12:42:59 +02:00
Cervantes Yu 90ab573ce5 Bug 764773: Fix memory leak in UeventPoller. r=cjones 2012-06-18 12:13:30 +02:00
Ryan VanderMeulen 5f2a19ee6e Revert c39d36167b99 due to a horribly munged backout. 2012-06-10 19:44:50 -04:00
Ryan VanderMeulen 6d6c4efbab Backout the bug 754202 backout due to orange. 2012-06-10 19:37:47 -04:00
Steven Lee fc59ca63c3 Bug 761796 Fixed the assertion failure. r=mwu 2012-06-07 10:00:26 -07:00
Landry Breuil 7483b8c333 Bug 758849 - UPower isn't linux-only, give it a chance to build on BSDs at least. Add a section taking them into account. r=mounir 2012-05-29 10:57:15 +02:00
Landry Breuil d25627bfb5 Bug 712910 - Use stdint types in sandbox/PHal.ipdl too, fixes build on OpenBSD - r=Ms2ger 2012-05-26 09:33:51 -04:00
Ms2ger 65aa2a4593 Merge m-c to m-i. 2012-05-25 11:15:32 +02:00
Ms2ger 3bfe10a2e0 Bug 712910 - Use stdint types in HAL; r=cjones 2012-05-25 09:18:30 +02:00
Cervantes Yu 32df83d69b Bug 758096: don't use NS_INLINE_DECL_REFCOUNTING() for classes to be passed between threads. r=mwu 2012-05-24 17:09:05 +08:00
Cervantes Yu f7f091cba7 Bug 758097: fix false warnings in debug build when reading switch uevent. r=mwu 2012-05-25 15:56:03 +08:00
Dave Hylands 0ab9e9d780 Bug 737153 - Enable mounting storage through USB from a host machine - Add the AutoMounter, sr=cjones r=qDot 2012-05-24 21:03:34 -07:00
Cervantes Yu ab223182e9 Bug 755546: fix incorrect deletion of the sensor observer list in unregistration of one observer. r=cjones 2012-05-21 18:12:03 +08:00
Gervase Markham 82ff7027aa Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
Michael Wu cf90910e81 Bug 755142 - Use ssize_t to store length of the sensor list, patch by an anonymous silicon vendor contributor, r=mwu 2012-05-16 14:52:00 -04:00
Kartikaya Gupta e3cf87e1b1 Bug 757025 - Guard against a null mObservers which is possible due to a race condition on some platforms. r=cjones 2012-05-24 13:53:40 -04:00
Michael Wu 9313f665de Bug 753521 - Use libhardware_legacy to turn off screen, r=jlebar 2012-05-09 14:30:22 -07:00
Etienne Segonzac c7b184c24f Bug 752683 - Always broadcasting the sensor events. r=dougt 2012-05-09 13:35:14 -07:00
Cervantes Yu 355b1a1c9a Bug 743638: Implement orientation API backend in gonk. r=mwu 2012-04-20 19:43:25 +08:00
Chris Jones 79b2b0b197 Bug 745145, part 4: Rename some things. r=mounir
--HG--
rename : hal/fallback/FallbackScreenOrientation.cpp => hal/fallback/FallbackScreenConfiguration.cpp
2012-05-08 14:36:07 -07:00
Chris Jones 78f28d4d90 Bug 745145, part 2: Implement the ScreenConfiguration hal for gonk. r=mounir 2012-05-08 14:36:07 -07:00
Chris Jones acbbfc1126 Bug 745145, part 1: Generalize ScreenOrientation into ScreenConfiguration, and add screen rect and color+pixel depth to it. r=mounir 2012-05-08 14:36:07 -07:00
Steven Lee dded98030c Bug 751423 - Wait for IO thread to finish setup. r=cjones 2012-05-04 15:16:27 +08:00
Doug Turner e474437e8e Bug 738465 - implement device light sensor. r=smaug 2012-05-02 09:43:45 -07:00
Doug Turner e188f5505d Bug 738131 - implement device proximity. r=smaug
* * *
Bug 738131 - implement device proximity. gonk implementation. r=mwu
2012-05-02 09:43:45 -07:00
Mounir Lamouri 566a670f97 Bug 749645 - Use fallback files in hal/ when a backend isn't implemneted instead of having randomly defined methods. r=cjones
--HG--
rename : hal/fallback/ScreenOrientationFallback.cpp => hal/fallback/FallbackScreenOrientation.cpp
rename : hal/linux/Power.cpp => hal/linux/LinuxPower.cpp
2012-05-03 12:05:32 +02:00
Makoto Kato aac13b73c5 Bug 625664 - accelerometer support using Windows 7 Sensor API. r=dougt 2012-05-01 12:04:30 +09:00
Steven Lee fce206dad7 Bug 736939 - Audio routing support. r=cjones, a=b2g-only 2012-04-22 14:09:22 -04:00
Kyle Machulis d8fa5ce720 Bug 747545: Uevent Poller causes compile error when built debug due to ScopedClose member change - r=mwu a=b2g-only 2012-04-20 18:43:25 -07:00
Michael Wu cfb6b5aa66 Bug 746728 - Add sensor index fallback for qemu, r=gal a=b2g-only 2012-04-18 17:18:08 -04:00
Kan-Ru Chen c3b3e39fdb Bug 739913 - Add cpuSleepAllowed attribute to mozPower. r=cjones 2012-04-16 18:35:33 -04:00
Cervantes Yu 6eaec4fdaa Bug 742226 - Refactor battery updater using uevent poller. r=cjones 2012-04-11 15:59:00 +08:00
Cervantes Yu 5328b0650d Bug 742226 - Create a uevent poller implementation. r=cjones 2012-04-13 12:02:33 +08:00
Ryan VanderMeulen 0f578d67d8 Back out entire dd28759eba7b push (bug 739913 and bug 742226) due to OSX 10.7 and b2g bustage. r=shouldausedtry 2012-04-12 20:00:57 -04:00
Cervantes Yu 3f1da18346 Bug 742226 - Refactor battery updater using the uevent poller. r=cjones 2012-04-11 15:59:00 +08:00
Cervantes Yu 077f479354 Bug 742226 - Add a uevent poller implementation. r=cjones 2012-04-05 15:49:28 +08:00
Kan-Ru Chen 14c301c057 Bug 739913 - Use kernel wake lock when the "cpu" topic is locked. r=cjones 2012-04-12 19:24:20 -04:00
Mounir Lamouri 9389b8f35e Bug 740190 - Screen Orientation API: implement locking in Android. r=dougt 2012-03-29 23:31:12 -07:00
Mounir Lamouri de3ed2a2f0 Bug 740188 - Screen Orientation API locking (1/3): DOM/HAL boilerplate. r=smaug sr=sicking 2012-03-29 12:43:16 -07:00
Steven Lee 709f1af70a Bug 734869 - Fix hang when shutting down sensors. r=mwu 2012-03-26 09:59:02 +02:00
Doug Turner 99d0547b5c Bug 738102 - devicemotion causes shutdown crash. r=jdm 2012-03-21 22:27:51 -07:00
Doug Turner d24a276ded Bug 737462 - nsDeviceMotion leaks hal observers. r=mwu 2012-03-20 23:36:17 -07:00
Doug Turner 92d9e7b245 Bug 735330 - move device motion from dom/system to hal. gonk cleanup. r=jdm 2012-03-20 23:36:17 -07:00
Doug Turner b1e4247d44 Bug 735330 - move device motion from dom/system to hal. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. cocoa bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. window/qt/linux bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. move accuracy into sensor data.  support compassneedscalibration. r=jdm

--HG--
rename : dom/system/cocoa/smslib.h => hal/cocoa/smslib.h
rename : dom/system/cocoa/smslib.mm => hal/cocoa/smslib.mm
2012-03-20 23:36:17 -07:00
Matt Brubeck 388850e1f0 Back out bug 735330, bug 737462, bug 734854 because they broke XUL Fennec
--HG--
rename : hal/cocoa/smslib.h => dom/system/cocoa/smslib.h
rename : hal/cocoa/smslib.mm => dom/system/cocoa/smslib.mm
2012-03-20 16:59:24 -07:00
Doug Turner 23746e5ebc Bug 737462 - nsDeviceMotion leaks hal observers. r=mwu 2012-03-20 14:50:55 -07:00
Doug Turner 1ee5aed0ed Bug 735330 - move device motion from dom/system to hal. gonk cleanup. r=jdm 2012-03-20 14:46:37 -07:00
Doug Turner 075acfd9f5 Bug 735330 - move device motion from dom/system to hal. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. cocoa bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. window/qt/linux bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. move accuracy into sensor data.  support compassneedscalibration. r=jdm

--HG--
rename : dom/system/cocoa/smslib.h => hal/cocoa/smslib.h
rename : dom/system/cocoa/smslib.mm => hal/cocoa/smslib.mm
2012-03-20 14:46:14 -07:00
Takanori MATSUURA 7c187aab34 Bug 736836 - Fix include so that hal/sandbox/PHal.ipdl can build with system NSPR. r=cjones 2012-03-20 17:21:56 -04:00
Mounir Lamouri d07b010629 Bug 720795 - Screen Orientation API reading and event implementation in Android. r=dougt 2012-03-20 14:09:45 +01:00
Mounir Lamouri 979c1d9364 Bug 735778 - Call MOZ_ASSERT if RemoveObserver is called with an observer that is not present. r=jlebar 2012-03-19 16:49:39 +01:00
Mounir Lamouri 37b6a6d4ef Bug 720794 - Part 1 (HAL) - Implement reading and event parts of Screen Orientation API. r=cjones 2012-03-13 17:42:46 +01:00
Mounir Lamouri ca7e35591f Bug 725951 - Don't abort if mObservers is null when removing an observer from ObserversManager. r=jlebar 2012-03-14 19:18:26 +01:00
Mark Finkle 5d52d341f9 Backout 7e28d1a2c648, 330b210f503d, 2421d39e0ab3, aa978ffa44bc, 38a71ae7e06d, b94319584a7a, 7e8278f5e814, 0b4e3c7608ab, 329c07609ca8, 0d61a0d8dba4, Due to Ts regression on Android 2012-03-17 21:51:39 -04:00
Mounir Lamouri e8b1ffee78 Bug 735778 - Call MOZ_ASSERT if RemoveObserver is called with an observer that is not present. r=jlebar 2012-03-16 19:32:11 +01:00
Mounir Lamouri 7948b3ca37 Bug 720795 - Screen Orientation API reading and event implementation in Android. r=dougt 2012-03-16 19:43:10 +01:00
Mounir Lamouri dac48325a5 Bug 720794 - Part 1 (HAL) - Implement reading and event parts of Screen Orientation API. r=cjones 2012-03-13 17:42:46 +01:00
Mounir Lamouri 4f23a6cd20 Bug 725951 - Don't abort if mObservers is null when removing an observer from ObserversManager. r=jlebar 2012-03-14 19:18:26 +01:00
Doug Turner 49f90f168c Bug 734324 - implement device motion - rotation rate and acceleration. r=jdm 2012-03-13 16:57:51 -07:00
Ed Morley 1f10388ce3 Backout 8b74d5ae78c3 & c619bbb2951f (bug 734391), 772c994fa869 (bug 734324), fd23ff0f9dd1 (bug 734325), d1e037a9390e (bug 733653), 3a7bf79b5b2d (bug 733650) & 9d9392fce538 (bug 733652) for OS X M1 & M3 orange 2012-03-13 22:29:29 +00:00
Doug Turner 10f24217b7 Bug 734324 - implement device motion - rotation rate and acceleration. r=jdm 2012-03-13 10:00:02 -07:00
Mounir Lamouri b2468304b1 Bug 733696 - Hal's CachingObservers shouldn't cache when GetCurrentInformation is called. r=jlebar 2012-03-07 19:26:38 +01:00
Fabrice Desré 3bdb296c33 Bug 730363 - startup slowdown waiting for batteryinfo [r=cjones] 2012-03-07 08:27:09 -08:00
Rafael Ávila de Espíndola c137fda1ab Bug 733721 - Fix lookup into dependent base class. r=jlebar.
--HG--
extra : rebase_source : be77ad9f7b833f32c8b6a0efe389836abc758bd4
2012-03-07 12:44:05 -03:00
Kan-Ru Chen c026ffddbc Bug 697132 - Implement wakelock interfaces. r=jlebar 2012-03-07 12:03:25 +01:00
Richard Newman e7b436563b Merge last win pgo-green changeset from m-i to m-c. 2012-02-23 18:35:17 -08:00
Masatoshi Kimura 651eabedd7 Bug 699247 - Remove Win2K related code. r=jimm, sr=neil 2012-02-23 08:53:55 -06:00
Mark Capella 3a0b126058 Bug 721496 - Remove MOZ_WINSDK_TARGETVER ifdefs for pre-Windows 7 SDKs. r=jimm 2012-02-23 01:33:19 +01:00
Vincent Chang fc5a31fa0f Bug 717150: Support adjust system clock and set timezone APIs in hal layer r=cjones. 2012-02-17 02:44:00 -08:00
Chris Jones 82ead30e4f Bug 722953 - "Cause hardware buttons to illuminate when button is pressed" [r=gal] 2012-02-14 19:24:00 -08:00
Fabrice Desré 10c4076464 Bug 727287 - Battery support for akami devices [r=mounir] 2012-02-16 14:40:43 -08:00
Ben Francis d88855e2f1 Bug 726612 - Gonk Battery API backend doesn't mark the device as charging when plugged to AC. r=mounir 2012-02-15 13:10:15 -05:00
Ms2ger 6c6590f809 Bug 712378 followup - Fix incorrect license headers; r=sparky 2012-02-10 11:04:44 +01:00
Jim Straus 5050012b61 Bug 712378: Add an interface to control lights, and use it for the screen backlight on Gonk. r=cjones 2012-02-01 22:09:00 -08:00
Steven Lee 3a090e39dd Bug 714413 - Sensor support for gonk [r=cjones] 2012-02-05 18:41:15 -08:00
Sinker Li 8d1dae936a Bug 697641, part 3: Make Sensor API available for Sandbox. r=cjones
Add Sensor API to PHal protocol that Sandbox can access sensors.
2012-02-05 19:51:06 +00:00
Sinker Li cee1f7b77a Bug 697641, part 2: Add a hal API for sensor access. r=cjones
With this API, Gecko code can access sensors provied by system.  This
patch include an implementation for Android.
2012-02-05 19:51:06 +00:00
Ed Morley 46f66f0c50 Backout 90f7f032757f, 6695904a4a70, 50e98f67df1b & d26e8631514c (bug 697641) for native Android failures and 20289eb83e51 (bug 712378) because it conflicted with the backout CLOSED TREE 2012-02-02 10:09:40 +00:00
Jim Straus d19707e250 Bug 712378: Add an interface to control lights, and use it for the screen backlight on Gonk. r=cjones 2012-02-01 22:09:00 -08:00
Sinker Li e3e44f99cb Bug 697641, part 3: Make Sensor API available for Sandbox. r=cjones
Add Sensor API to PHal protocol that Sandbox can access sensors.
2012-02-01 22:47:55 -08:00
Sinker Li d31b0fb85f Bug 697641, part 2: Add a hal API for sensor access. r=cjones
With this API, Gecko code can access sensors provied by system.  This
patch include an implementation for Android.
2012-02-01 22:47:53 -08:00
Kan-Ru Chen f54487e0fe Bug 709585 - Part 5, hal code for the Power API. r=cjones
--HG--
extra : rebase_source : 49c8cb29be617293eb9143b3e3c760229b37943c
2012-01-31 01:08:00 -05:00
Scott Johnson 8a04769547 Backout 6a4c4cb828a8 for bustage on windows. 2012-01-30 18:47:43 -06:00
Kan-Ru Chen fd88fd0443 Bug 709585 - Part 5/6, hal code for the Power API. r=cjones
--HG--
extra : rebase_source : 689315521a72444c8a0fc92efe128d5bf3fbbada
2012-01-30 17:02:51 -06:00
Mounir Lamouri 3a65d78a07 Bug 719632 - Add Network API fallback methods to the hal's gonk backend. r=cjones 2012-01-22 08:43:38 +01:00
Mounir Lamouri 731b61f2b9 Bug 713687 - Part 4 - Network API Android backend: use enable/disable notifications to prevent listening when not needed. r=dougt 2012-01-16 15:01:07 +01:00
Mounir Lamouri 7deb857d08 Bug 713687 - Part 1 - Network API Android backend: get current information. r=dougt 2012-01-16 14:44:07 +01:00
Mounir Lamouri 7f5c471516 Bug 677166 - Part 6 - Add NetworkInformation handling into hal. r=jlebar 2012-01-16 14:39:57 +01:00
Marco Bonardo 2b20126f0a Backout 789f244f34f8, 1bea53f2d067, 577cba6021d2, 4191fe602648 (bug 697641) for win build bustage 2012-01-16 15:43:46 +01:00
Dão Gottwald bb7315ed5b Bug 697641, part 3: Make Sensor API available for Sandbox. r=cjones
Add Sensor API to PHal protocol that Sandbox can access sensors.
2012-01-16 14:37:49 +01:00
Sinker Li e6c5bdac28 Bug 697641, part 2: Add a hal API for sensor access. r=cjones
With this API, Gecko code can access sensors provied by system.  This
patch include an implementation for Android.
2012-01-16 14:37:44 +01:00
Chris Jones 9c8debe62e Bug 717155: Poke a different backlight controller. Stopgap for bug 712378. rs=jlebar 2012-01-11 11:56:23 -08:00
Philipp von Weitershausen 6def101a2d Bug 713149 - hal_impl has no method GetCurrentBatteryInformation. r=cjones 2011-12-24 06:03:55 +01:00
Justin Lebar 475c51c566 Bug 712665 - Fix GonkHal.cpp debug compile errors. r=mwu 2011-12-21 17:58:29 -08:00
Chris Jones a68497db49 Bug 712226 - Crash when fclose(NULL)'ing a battery-status FILE*, r=mwu 2011-12-21 17:58:29 -08:00
Justin Lebar b6324ce74d Bug 694862 - Implement navigator.mozVibrate for Gonk, r=cjones 2011-12-21 17:58:29 -08:00
Michael Wu 3223390ab0 Land GonkHal.cpp - Bug 696042 r=cjones, Bug 702256 r=cjones,mounir, Bug 694862 r=cjones 2011-12-20 11:31:53 -08:00
Makoto Kato b847b80445 Bug 710178 - ASSERTION: Battery API: When charging and level at 1.0, remaining time should be 0. Please fix your backend. r=mounir 2011-12-19 12:23:13 +09:00
Mounir Lamouri 89c9cdad29 Bug 709584 - Make Hal observer management a more generic. r=jlebar sr=cjones 2011-12-17 22:51:44 +01:00
Mounir Lamouri c5f39a761e Bug 710793 - Move hal's private methods outside of Hal.h. r=jlebar sr=cjones 2011-12-17 22:04:51 +01:00
Mounir Lamouri c6837496c2 Bug 710748 - Remove useless forward declaration in Hal.h. r=jlebar 2011-12-17 19:30:07 +01:00
Mounir Lamouri 037243501b Bug 710745 - Don't expose WindowIdentifier in Hal.h. r=jlebar sr=cjones 2011-12-17 22:04:26 +01:00
Justin Lebar 1b4574913a Bug 679966, part 2: Add mozVibrator() for "playing" a vibration pattern. r=bz 2011-11-10 16:26:36 -05:00
Justin Lebar 36337622b8 Bug 706958 - Add ClearOnShutdown() function which will clear a smart pointer on shutdown. r=bsmedberg 2011-12-15 10:51:11 -05:00
Andrew Quartey 6fe0fd072a Bug 706010 - Remove NS_SPECIALIZE_TEMPLATE and HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX; r=khuey a=cleanup/removal 2011-12-13 14:17:59 +00:00
Justin Lebar cbab1727e4 Bug 702256 - "[Gonk] Add DOM API for turning screen on/off and adjusting the screen's brightness" r=cjones,mounir 2011-12-05 01:07:00 +08:00
Marco Bonardo 565d479ac5 Backout 407fba8cbd5a (bug 702256) for build failure on Windows. 2011-12-05 13:48:59 +01:00
Justin Lebar e5c7ffb65c Bug 702256 - "[Gonk] Add DOM API for turning screen on/off and adjusting the screen's brightness" r=cjones,mounir
--HG--
extra : rebase_source : 6c1f1b49d911e749da524266695e2f05d52900b2
2011-12-05 01:07:00 +08:00
Makoto Kato 7a9046338e Bug 696049 - Battery API: Windows backend. r=mounir,jimm 2011-12-05 19:34:27 +09:00
Mounir Lamouri 973a04fe26 Bug 707085 - Fix Battery API default values. r=sicking 2011-12-04 21:00:21 +08:00
Mounir Lamouri 190ac8da9f Bug 705084 - Part B - Use kDefaultRemainingTime instead of kUnknownRemaining time when appropriate in UPower backend. r=cjones 2011-12-01 11:50:58 +01:00
Michael Wu 95e746a177 Bug 703307 - Fix build/crash in gonk, r=cjones 2011-11-22 11:51:51 -08:00
Mounir Lamouri 61ee629f94 Bug 703610 - Return level=1.0 when the battery is full (Battery API UPower backend). r=cjones 2011-11-22 10:36:22 +01:00
Mounir Lamouri ec91a51f65 Bug 700262 - Add remainingTime support to upower backend. r=cjones 2011-11-09 10:00:01 +01:00
Mounir Lamouri b4692e95a1 Bug 700261 - Add .chargingTime/.dischargingTime support to hal code. r=cjones 2011-11-09 09:58:59 +01:00
Mounir Lamouri a586195b8a Bug 699742 - (3/4) battery.level should be a double (upower backend). r=cjones 2011-11-09 09:56:22 +01:00
Mounir Lamouri 5a0711c887 Bug 699742 - (2/4) battery.level should be a double (hal part). r=cjones 2011-11-09 15:15:28 +01:00
Chris Jones dc33fffa65 Bug 679966, part 1: Add vibrator support for android. r=blassey,cjones 2011-09-30 00:00:48 -07:00
Mounir Lamouri 9e722c9ee8 Bug 696041 - Battery API backend for linux with upower. r=karlt,cjones sr=roc 2011-11-03 11:33:31 +01:00
Mounir Lamouri 505e9f3919 Bug 696038 - (2/3) Boilerplate code to communicate between hal and Android Java code. r=cjones 2011-11-02 16:35:11 +01:00
Mounir Lamouri 1d3e0bab04 Bug 696038 - (1/3) Add an Android implementation for hal. r=cjones 2011-11-02 16:28:26 +01:00
Mounir Lamouri f2fd1ece99 Bug 678694 - (6/7) hal code for the Battery API. r=cjones 2011-11-02 16:14:01 +01:00
Justin Lebar 564c0d15b2 No bug - Fix vim modelines in hal. rs=biesi DONTBUILD 2011-10-20 17:38:39 -04:00
Chris Jones e427b8472f Bug 690670, parts 1 and 2: Add a hal/ directory in which we can add device-interaction code, and build goop thereto. r=khuey sr=roc
--HG--
extra : rebase_source : bf3dc09f49d010ac4422150fc5300a41080af858
2011-10-05 15:15:45 -07:00