# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1270649728 25200
# Node ID 01020f017806437cce48ea312b5e348d61420042
# Parent  30161c82a278f1898c4d31c323527599e2454cfa# Parent  7110c07edd4bdb9b58b235320b9251b4eeea1baf
merging something

diff -r 30161c82a278 -r 01020f017806 .fluxbox/keys
--- a/.fluxbox/keys	Tue Apr 06 14:31:03 2010 -0700
+++ b/.fluxbox/keys	Wed Apr 07 07:15:28 2010 -0700
@@ -51,6 +51,7 @@
 Control Mod1 i :ExecCommand import /home/jhammel/screenshot.png
 Control Mod1 k :ExecCommand echo $(curl $(xclip -o)?format=text) - $(xclip -o) | xclip -i # bitsyblog entry
 Control Mod1 l :ExecCommand echo http://letmegooglethatforyou.com/?q=$(xclip -o) | xclip -i
+Control Mod1 m :ExecCommand  xterm -e alsamixer # mixer
 Control Mod1 o :ExecCommand xclip -o | /home/jhammel/python/onelineit.py | xclip -i # put the clipboard contents on one line
 Control Mod1 p :ExecCommand xclip -o | /home/jhammel/python/pastebin.py | xclip -i # send the clipboard contents to pastebin and replace with the URL
 Control Mod1 s :ExecCommand /home/jhammel/bin/smartopen "$(xclip -o)" # smartopen