From cc04847961c76ac9e04b6b5f8a35188a0d282a9e Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Fri, 26 Apr 2013 00:47:35 -0700
Subject: [PATCH] Merge fixes.

---
 src/cpp/ripple/LedgerAcquire.cpp | 8 +++++++-
 src/cpp/ripple/LedgerMaster.cpp  | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/cpp/ripple/LedgerAcquire.cpp b/src/cpp/ripple/LedgerAcquire.cpp
index 8da67496dd..df8f115b6e 100644
--- a/src/cpp/ripple/LedgerAcquire.cpp
+++ b/src/cpp/ripple/LedgerAcquire.cpp
@@ -933,7 +933,10 @@ void LedgerAcquireMaster::gotLedgerData(Job&, uint256 hash,
 			cLog(lsWARNING) << "Included TXbase invalid";
 		}
 		if (!san.isInvalid())
+		{
+			ledger->progress();
 			ledger->trigger(peer);
+		}
 		return;
 	}
 
@@ -967,7 +970,10 @@ void LedgerAcquireMaster::gotLedgerData(Job&, uint256 hash,
 		else
 			ledger->takeAsNode(nodeIDs, nodeData, ret);
 		if (!ret.isInvalid())
-				ledger->trigger(peer);
+		{
+			ledger->progress();
+			ledger->trigger(peer);
+		}
 		return;
 	}
 
diff --git a/src/cpp/ripple/LedgerMaster.cpp b/src/cpp/ripple/LedgerMaster.cpp
index f7169777fb..20a3d93c06 100644
--- a/src/cpp/ripple/LedgerMaster.cpp
+++ b/src/cpp/ripple/LedgerMaster.cpp
@@ -265,7 +265,7 @@ bool LedgerMaster::acquireMissingLedger(Ledger::ref origLedger, const uint256& l
 		{
 			typedef std::pair<uint32, uint256> u_pair;
 			std::vector<u_pair> vec = origLedger->getLedgerHashes();
-			BOOST_FOREACH(const u_pair& it, vec)
+			BOOST_REVERSE_FOREACH(const u_pair& it, vec)
 			{
 				if ((fetchCount < fetchMax) && (it.first < ledgerSeq) &&
 					!mCompleteLedgers.hasValue(it.first) && !theApp->getMasterLedgerAcquire().find(it.second))