Merge remote branch 'upstream/selectmenu' into selectmenu

Conflicts:
	themes/base/jquery.ui.selectmenu.css

diff --cc themes/base/jquery.ui.selectmenu.css
index 781527111cf14089eb5566801056249b0b75ef6a,350aa9dbe06341a8910afb00e0d1a9fd15edfd66..d0acac0c877049ae8b9b4402dc10e55786c07504
--- 1/themes/base/jquery.ui.selectmenu.css
--- 2/themes/base/jquery.ui.selectmenu.css
+++ b/themes/base/jquery.ui.selectmenu.css
@@@ -12,16 -12,13 +12,16 @@@
  .ui-selectmenu-hasIcon .ui-selectmenu-status { padding-left: 20px; position: relative; margin-left: 5px; }
  .ui-selectmenu-menu li .ui-icon, .ui-selectmenu-status .ui-icon { position: absolute; top: 1em; margin-top: -8px; left: 0; }
  .ui-selectmenu-status { line-height: 1.4em; }
- .ui-selectmenu-open li.ui-selectmenu-item-focus a {  }
+ .ui-selectmenu-open li.ui-selectmenu-item-focus a { }
  .ui-selectmenu-open li.ui-selectmenu-item-selected { }
 +/* Disabled option styling */
 +.ui-selectmenu-menu li.disabled { border: 1px solid transparent; }
 +.ui-selectmenu-menu li.disabled a { cursor: default; color: #A9ACAF; background: #EBEBEC; }
  .ui-selectmenu-menu li span,.ui-selectmenu-status span { display:block; margin-bottom: .2em; }
  .ui-selectmenu-menu li .ui-selectmenu-item-header { font-weight: bold; }
- .ui-selectmenu-menu li .ui-selectmenu-item-content {  }
+ .ui-selectmenu-menu li .ui-selectmenu-item-content { }
  .ui-selectmenu-menu li .ui-selectmenu-item-footer { opacity: .8; }
  /*for optgroups*/
  .ui-selectmenu-menu .ui-selectmenu-group { font-size: 1em; }
- .ui-selectmenu-menu .ui-selectmenu-group .ui-selectmenu-group-label { line-height: 1.4em; display:block; padding:.6em .5em 0; font-weight: bold; }
+ .ui-selectmenu-menu .ui-selectmenu-group .ui-selectmenu-group-label { line-height: 1.4em; display:block; padding: .6em .5em 0; font-weight: bold; }
 -.ui-selectmenu-menu .ui-selectmenu-group ul { margin: 0; padding: 0; }
 +.ui-selectmenu-menu .ui-selectmenu-group ul { margin: 0; padding: 0; }

diff --cc ui/jquery.ui.selectmenu.js
Simple merge