Index: lib/Target/TargetMachine.cpp
===================================================================
--- lib/Target/TargetMachine.cpp	(.../branches/UPSTREAM)	(revision 50)
+++ lib/Target/TargetMachine.cpp	(.../trunk)	(revision 50)
@@ -91,11 +91,11 @@ namespace {
                  "  Relocatable external references, non-relocatable code"),
       clEnumValEnd));
   cl::opt<llvm::CodeModel::Model, true>
   DefCodeModel(
     "code-model",
-    cl::desc("Choose relocation model"),
+    cl::desc("Choose code model"),
     cl::location(CMModel),
     cl::init(CodeModel::Default),
     cl::values(
       clEnumValN(CodeModel::Default, "default",
                  "  Target default code model"),
Index: include/llvm/Support/OutputBuffer.h
===================================================================
--- include/llvm/Support/OutputBuffer.h	(.../branches/UPSTREAM)	(revision 50)
+++ include/llvm/Support/OutputBuffer.h	(.../trunk)	(revision 50)
@@ -33,11 +33,11 @@ namespace llvm {

     // align - Emit padding into the file until the current output position is
     // aligned to the specified power of two boundary.
     void align(unsigned Boundary) {
       assert(Boundary && (Boundary & (Boundary - 1)) == 0 &&
-             "Must alitypedef std::vector<unsigned char> DataBuffer;gn to 2^k boundary");
+             "Must align to 2^k boundary");
       size_t Size = Output.size();

       if (Size & (Boundary - 1)) {
         // Add padding to get alignment to the correct place.
         size_t Pad = Boundary - (Size & (Boundary - 1));