From 713ff8c5e25a86606c75c2a162cac76b180da1a0 Mon Sep 17 00:00:00 2001
From: Tetsuo Kiso <tetsuo-s@is.naist.jp>
Date: Fri, 1 Jun 2012 02:25:25 +0900
Subject: [PATCH 1/2] Delete mert/init.opt.

It looks like the file was no longer used.
---
 mert/init.opt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 mert/init.opt

diff --git a/mert/init.opt b/mert/init.opt
deleted file mode 100644
index 32ab00796d..0000000000
--- a/mert/init.opt
+++ /dev/null
@@ -1 +0,0 @@
-0.1 0.1 0.3 0.4 0.7 0.5 0.01 0.02 0.1 0.1 0.3 0.4 0.7 9
\ No newline at end of file

From f716673f6765b2ce5c04b716e21cf233b4e17c8f Mon Sep 17 00:00:00 2001
From: Barry Haddow <barry.haddow@gmail.com>
Date: Thu, 31 May 2012 22:58:39 +0100
Subject: [PATCH 2/2] Allow combination of --prefix and --git

---
 jam-files/sanity.jam | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index 76763f98dc..35caf46029 100644
--- a/jam-files/sanity.jam
+++ b/jam-files/sanity.jam
@@ -158,9 +158,11 @@ if [ option.get "git" : : "yes" ] {
 prefix = [ option.get "prefix" ] ;
 if $(prefix) {
   prefix = [ path.root $(prefix) [ path.pwd ] ] ;
+  prefix = $(prefix)$(GITTAG) ;
 } else {
   prefix = $(TOP)$(GITTAG) ;
 }
+
 rule install-bin-libs ( deps * ) {
   local bindir = [ option.get "bindir" : $(prefix)/bin ] ;
   local libdir = [ option.get "libdir" : $(prefix)/lib ] ;