Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee...

Conflicts:
	js/dropdown.js

diff --cc js/dropdown.js
index b19b255ae0c91aa7b2f1c507251adc8042d4cc54,0a210ef355bde3fa0426a47d22210bfe77134e46..1e25403fc01344e1d2c672dde49f657e88904a87
--- 1/js/dropdown.js
--- 2/js/dropdown.js
+++ b/js/dropdown.js
@@@ -139,7 -149,7 +140,7 @@@
    $(document)
      .on('click.bs.dropdown.data-api', clearMenus)
      .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
 -    .on('click.bs.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
 -    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]' , Dropdown.prototype.keydown)
 +    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-     .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]', Dropdown.prototype.keydown)
++    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown)
  
  }(jQuery);