Botan with Sun Forte

Botan needs a small patch for a succesful compile with Sun's Forte compiler. This patch was tested with Botan 1.6.4 and Forte 12:

============================================================
--- include/stl_util.h  b9f4d9cdc69fe99ac39bc08f3f7f3d34b641b1a4
+++ include/stl_util.h  59c059153a6919e49913da8083db6d6c00d4966e
@@ -76,7 +76,7 @@ void multimap_insert(std::multimap<K, V>
 void multimap_insert(std::multimap<K, V>& multimap,
                      const K& key, const V& value)
    {
-   multimap.insert(std::make_pair(key, value));
+   multimap.insert(std::make_pair<const K, V>(key, value));
    }
 
 }
============================================================
--- src/datastor.cpp    fcd6e9b334b5a03771e4571d6efacbd346a35e45
+++ src/datastor.cpp    e25f3d197dd3b0fae5601d88bcc2406b56a119a4
@@ -50,7 +50,12 @@ Data_Store::search_with(const Matcher& m
    while(i != contents.end())
       {
       if(matcher(i->first, i->second))
-         out.insert(matcher.transform(i->first, i->second));
+         {
+         std::pair<std::string, std::string> in =
+            matcher.transform(i->first, i->second);
+
+         multimap_insert(out, in.first, in.second);
+         }
       ++i;
       }