Index: src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
===================================================================
--- src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl	(revision 804301)
+++ src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl	(revision )
@@ -215,15 +215,58 @@
                     </form>
                   </xsl:when>
                   <xsl:otherwise>
-                    <form class="roundtopsmall" method="get" action="http://www.lucidimagination.com/search/">
+                    <script type="text/javascript">
+                      function selectProvider(form) {
+                        provider = form.elements['searchProvider'].value;
+                        if (provider == "any") {
+                          if (Math.random() > 0.5) {
+                            provider = "lucid";
+                          } else {
+                            provider = "sl";
+                          }
+                        }
+
+                        if (provider == "lucid") {
+                          form.action = "http://www.lucidimagination.com/search/";
+                        } else if (provider == "sl") {
+                          form.action = "http://search-lucene.com/";
+                        }
+
+                        days = 365; // cookie will be valid for a year
+                        date = new Date();
+                        date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+                        expires = "; expires=" + date.toGMTString();
+                        document.cookie = "searchProvider=" + provider + expires + "; path=/";
+                      }
+                    </script>
+                    <form class="roundtopsmall" method="get" action="http://www.lucidimagination.com/search/" id="searchform">
                       <input type="text" id="query" name="q" size="25" onFocus="getBlank (this, '{$search-prompt}');">
                         <xsl:attribute name="value">
                           <xsl:value-of select="$search-prompt"/>
                         </xsl:attribute>
                       </input>&#160; 
-                    <input type="submit" value="Search" name="Search" i18n:attr="value"/>
+                      <input type="submit" value="Search" name="Search" onclick="selectProvider(this.form)"/>
+                      @
+                      <select name="searchProvider" id="searchProvider">
+                        <option value="any">select provider</option>
+                        <option value="lucid">Lucid Find</option>
+                        <option value="sl">Search-Lucene</option>
+                      </select>
+                      <script type="text/javascript">
+                        if (document.cookie.length>0) {
+                          cStart=document.cookie.indexOf("searchProvider=");
+                          if (cStart!=-1) {
+                            cStart=cStart + "searchProvider=".length;
+                            cEnd=document.cookie.indexOf(";", cStart);
+                            if (cEnd==-1) {
+                              cEnd=document.cookie.length;
+                            }
+                            provider = unescape(document.cookie.substring(cStart,cEnd));
+                            document.forms['searchform'].elements['searchProvider'].value = provider;
+                          }
+                        }
+                      </script>
                     </form>
-		    <div style="position: relative; top: -5px; left: -10px">Powered by <a style="color: #033268" href="http://www.lucidimagination.com">Lucid Imagination</a></div>
                   </xsl:otherwise>
                 </xsl:choose>
 <!--div id="roundbottomsmall">
@@ -472,13 +515,57 @@
               </form>
             </xsl:when>
             <xsl:otherwise>
-	            <form class="roundtopsmall" method="get" action="http://www.lucidimagination.com/search/">
+              <script type="text/javascript">
+                function selectProvider(form) {
+                  provider = form.elements['searchProvider'].value;
+                  if (provider == "any") {
+                    if (Math.random() > 0.5) {
+                      provider = "lucid";
+                    } else {
+                      provider = "sl";
+                    }
+                  }
+
+                  if (provider == "lucid") {
+                    form.action = "http://www.lucidimagination.com/search/";
+                  } else if (provider == "sl") {
+                    form.action = "http://search-lucene.com/";
+                  }
+
+                  days = 365; // cookie will be valid for a year
+                  date = new Date();
+                  date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+                  expires = "; expires=" + date.toGMTString();
+                  document.cookie = "searchProvider=" + provider + expires + "; path=/";
+                }
+              </script>
+                <form class="roundtopsmall" method="get" action="http://www.lucidimagination.com/search/" id="searchform">
                   <input type="text" id="query" name="q" size="25" onFocus="getBlank (this, '{$search-prompt}');">
                     <xsl:attribute name="value">
                       <xsl:value-of select="$search-prompt"/>
                     </xsl:attribute>
                   </input>&#160; 
-                <input type="submit" value="Search" name="Search" i18n:attr="value"/>
+                <input type="submit" value="Search" name="Search" onclick="selectProvider(this.form)"/>
+                @
+                <select name="searchProvider" id="searchProvider">
+                  <option value="any">select provider</option>
+                  <option value="lucid">Lucid Find</option>
+                  <option value="sl">Search-Lucene</option>
+                </select>
+                <script type="text/javascript">
+                  if (document.cookie.length>0) {
+                    cStart=document.cookie.indexOf("searchProvider=");
+                    if (cStart!=-1) {
+                      cStart=cStart + "searchProvider=".length;
+                      cEnd=document.cookie.indexOf(";", cStart);
+                      if (cEnd==-1) {
+                        cEnd=document.cookie.length;
+                      }
+                      provider = unescape(document.cookie.substring(cStart,cEnd));
+                      document.forms['searchform'].elements['searchProvider'].value = provider;
+                    }
+                  }
+                </script>
                 </form>
             </xsl:otherwise>
           </xsl:choose>
Index: src/documentation/skins/lucene/css/screen.css
===================================================================
--- src/documentation/skins/lucene/css/screen.css	(revision 787512)
+++ src/documentation/skins/lucene/css/screen.css	(revision )
@@ -95,7 +95,7 @@
 #top .searchbox {
     position: absolute;
     right: 10px;
-    height: 42px;
+    height: 28px;
     font-size: 70%;
     white-space: nowrap;
     text-align: right;