Merge commit '2e4c276d4c642e43be3d4bb9d7314f87c21746a6'

diff --combined cgilite/common.css
index 38eff7da3b957999ff674f26ebe80ca3bf1c4409,dbaafd1f49b6c3fcdb6208bb1b7ed633f161d288..dbaafd1f49b6c3fcdb6208bb1b7ed633f161d288
--- 1/cgilite/common.css
--- 2/common.css
+++ b/cgilite/common.css
@@@ -126,7 -126,7 +126,7 @@@ input.search + button.search 
    white-space: nowrap;
    overflow: hidden;
  }
- input[type="search"] + button.search:before {
+ input[type="search"] + button.search:before,
  input.search + button.search:before {
    content: '\1f50d';
    color: #000;