Merge commit 'remotes/UPSTREAM/master'
authorVictor Lowther <victor.lowther@gmail.com>
Sun, 8 Nov 2009 05:26:39 +0000 (23:26 -0600)
committerVictor Lowther <victor.lowther@gmail.com>
Sun, 8 Nov 2009 05:26:39 +0000 (23:26 -0600)
commit6014e54b7f007109616965ff601ff05ea6fc397a
tree50fc73bc32b4ee91bb7cdc9d3cc003bf46a65d5f
parent504faf0a0c31cbdbc03a608cf633d58f12e49eb7
parent6691c51d58951c328e08e50087b354ceb2c4f3db
Merge commit 'remotes/UPSTREAM/master'
pm/sleep.d/90clock