am 29019cb9: (-s ours) am c96307ef: Merge "Make the silent/vibrate status icon...
am 29019cb9: (-s ours) am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
Merge commit '29019cb9' into kraken
* commit '29019cb9':
Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)