109 files changed, 218 insertions, 218 deletions
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.c b/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.c
index aa2a22edd1..62addcb251 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.h
index 44bc53e91c..ba7cf2dad5 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Compress.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Compress.h
index f0e0ecb6cf..bd4e3a460a 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Compress.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Compress.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                              
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.c b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.c
index 6239ccc31e..5ceb6b5c42 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.h
index c2d062d256..d0f78f80c3 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Decompress.c b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Decompress.c
index 8afabae7d6..3f05bda697 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Decompress.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Decompress.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Decompress.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Decompress.h
index 515e7fdbed..50458ef872 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Decompress.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Decompress.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                              
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCompress.c b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCompress.c
index 6f2922ea3d..8d67889765 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCompress.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCompress.c
@@ -1,7 +1,7 @@
 /*
 
-Copyright (c) 2006, Intel Corporation                                              
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCustomizedCompress.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCustomizedCompress.h
index 2a7b8d1569..74cbf06467 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCustomizedCompress.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCustomizedCompress.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.c b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.c
index 37705a84f1..fdce9bff39 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.h
index 65b1c7f9c2..270115245e 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.c b/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.c
index d660c07f4b..341204852c 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.h
index 88c40cdbcb..3af33b3137 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Makefile
index 7e0f8fc2ae..9e1788f5ec 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #   
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.c b/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.c
index 39fddf7428..5d2237470b 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.h
index 5cfb4e0cab..e3eac2dc9d 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.c b/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.c
index 159d81b207..3d9fe11ab9 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.h
index 32b94bc69f..7dba8f8fdc 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.c b/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.c
index 2a2fbe6d90..ecea0b8125 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.h
index 67e4fdf37b..14bd7aa7f6 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/TianoCompress.c b/EdkCompatibilityPkg/Sample/Tools/Source/Common/TianoCompress.c
index 5cb13b2304..c96a3964af 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/TianoCompress.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/TianoCompress.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                              
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/CustomizedCompress/CustomizedCompress.c b/EdkCompatibilityPkg/Sample/Tools/Source/CustomizedCompress/CustomizedCompress.c
index a4af74aff2..a336178681 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/CustomizedCompress/CustomizedCompress.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/CustomizedCompress/CustomizedCompress.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/CustomizedCompress/makefile b/EdkCompatibilityPkg/Sample/Tools/Source/CustomizedCompress/makefile
index 590d0fd78f..4eb39b7b72 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/CustomizedCompress/makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/CustomizedCompress/makefile
@@ -1,7 +1,7 @@
 #/*++
 #   
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/EfiCompress/EfiCompressMain.c b/EdkCompatibilityPkg/Sample/Tools/Source/EfiCompress/EfiCompressMain.c
index 180422cae2..d30d6272cf 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/EfiCompress/EfiCompressMain.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/EfiCompress/EfiCompressMain.c
@@ -1,7 +1,7 @@
 /*++ 
 
-Copyright 2006 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/EfiCompress/makefile b/EdkCompatibilityPkg/Sample/Tools/Source/EfiCompress/makefile
index 5f86d50446..14499d62dd 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/EfiCompress/makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/EfiCompress/makefile
@@ -1,7 +1,7 @@
 #/*++
 #   
-#  Copyright (c) 2006 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/EfiRom/EfiRom.c b/EdkCompatibilityPkg/Sample/Tools/Source/EfiRom/EfiRom.c
index f5ab9ff234..11ae84f8ff 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/EfiRom/EfiRom.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/EfiRom/EfiRom.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/EfiRom/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/EfiRom/Makefile
index 39d39db868..58dfabc4f6 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/EfiRom/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/EfiRom/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #  
-#  Copyright (c) 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/FwImage/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/FwImage/Makefile
index bc31b23296..efeace8854 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/FwImage/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/FwImage/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #   
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/FwImage/fwimage.c b/EdkCompatibilityPkg/Sample/Tools/Source/FwImage/fwimage.c
index 8a9274d5c0..eb23dc7637 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/FwImage/fwimage.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/FwImage/fwimage.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenAprioriFile/GenAprioriFile.c b/EdkCompatibilityPkg/Sample/Tools/Source/GenAprioriFile/GenAprioriFile.c
index 98cbb072de..e346a1e4c8 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenAprioriFile/GenAprioriFile.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenAprioriFile/GenAprioriFile.c
@@ -1,7 +1,7 @@
 /*++
 
- Copyright (c) 2006, Intel Corporation                                                         
- All rights reserved. This program and the accompanying materials                          
+ Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+ This program and the accompanying materials                          
  are licensed and made available under the terms and conditions of the BSD License         
  which accompanies this distribution.  The full text of the license may be found at        
  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenAprioriFile/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/GenAprioriFile/Makefile
index 82365a4809..b4f9059ddd 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenAprioriFile/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenAprioriFile/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #  
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenCRC32Section/GenCRC32Section.c b/EdkCompatibilityPkg/Sample/Tools/Source/GenCRC32Section/GenCRC32Section.c
index 27a02a4da9..b1f3f1eec4 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenCRC32Section/GenCRC32Section.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenCRC32Section/GenCRC32Section.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenCRC32Section/GenCRC32Section.h b/EdkCompatibilityPkg/Sample/Tools/Source/GenCRC32Section/GenCRC32Section.h
index 7f88be2364..763a11cb76 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenCRC32Section/GenCRC32Section.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenCRC32Section/GenCRC32Section.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenCRC32Section/makefile b/EdkCompatibilityPkg/Sample/Tools/Source/GenCRC32Section/makefile
index cb4bc3c408..456a3df210 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenCRC32Section/makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenCRC32Section/makefile
@@ -1,7 +1,7 @@
 #/*++
 #   
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/DepexParser.c b/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/DepexParser.c
index 5cd15331db..a096e9362e 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/DepexParser.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/DepexParser.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/DepexParser.h b/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/DepexParser.h
index 29e0884a3e..8154721064 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/DepexParser.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/DepexParser.h
@@ -1,6 +1,6 @@
 /*++
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/GenDepex.c b/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/GenDepex.c
index 59a8f384b3..37c1039c0f 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/GenDepex.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/GenDepex.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/GenDepex.h b/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/GenDepex.h
index d9df5faa69..a1d6ec30d3 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/GenDepex.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/GenDepex.h
@@ -1,6 +1,6 @@
 /*++
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/makefile b/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/makefile
index 504935305e..cd9f865817 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenDepex/makefile
@@ -1,7 +1,7 @@
 #/*++
 #   
-# Copyright (c) 2004 - 2007, Intel Corporation                                                         
-# All rights reserved. This program and the accompanying materials                          
+# Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+# This program and the accompanying materials                          
 # are licensed and made available under the terms and conditions of the BSD License         
 # which accompanies this distribution.  The full text of the license may be found at        
 # http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFfsFile/GenFfsFile.c b/EdkCompatibilityPkg/Sample/Tools/Source/GenFfsFile/GenFfsFile.c
index 2e06570633..d4053671f5 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFfsFile/GenFfsFile.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFfsFile/GenFfsFile.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFfsFile/GenFfsFile.h b/EdkCompatibilityPkg/Sample/Tools/Source/GenFfsFile/GenFfsFile.h
index d3bcdbb90c..ebaa32d4ed 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFfsFile/GenFfsFile.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFfsFile/GenFfsFile.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFfsFile/makefile b/EdkCompatibilityPkg/Sample/Tools/Source/GenFfsFile/makefile
index 2be50923ad..823a2e2ba0 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFfsFile/makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFfsFile/makefile
@@ -1,7 +1,7 @@
 #/*++
 #   
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageExe.c b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageExe.c
index ccd1199435..8d9a7768ec 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageExe.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageExe.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageExe.h b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageExe.h
index 9b97935656..d0dd1bbe02 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageExe.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageExe.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.c b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.c
index 3c591841ed..cb193ce2ce 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.h b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.h
index 2670ed5cce..be620c44e4 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLibInternal.h b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLibInternal.h
index 5bc541ca88..c8e63e83d1 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLibInternal.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLibInternal.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/Makefile
index 18243b697b..a7cac1746f 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #   
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenSection/GenSection.c b/EdkCompatibilityPkg/Sample/Tools/Source/GenSection/GenSection.c
index 61ce9caafa..1d1c307e87 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenSection/GenSection.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenSection/GenSection.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenSection/GenSection.h b/EdkCompatibilityPkg/Sample/Tools/Source/GenSection/GenSection.h
index 24c1c4e34d..26e5a72d2e 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenSection/GenSection.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenSection/GenSection.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenSection/makefile b/EdkCompatibilityPkg/Sample/Tools/Source/GenSection/makefile
index 963ff16ef2..e2678a5323 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenSection/makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenSection/makefile
@@ -1,7 +1,7 @@
 #/*++
 #
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenTEImage/GenTEImage.c b/EdkCompatibilityPkg/Sample/Tools/Source/GenTEImage/GenTEImage.c
index 6f22782daf..f9988257f1 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenTEImage/GenTEImage.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenTEImage/GenTEImage.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 1999 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 1999 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenTEImage/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/GenTEImage/Makefile
index 3799877b92..545d988d18 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GenTEImage/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenTEImage/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #
-#  Copyright (c) 2002 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2002 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/CommonUtils.h b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/CommonUtils.h
index 648f20f252..fe2c41c321 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/CommonUtils.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/CommonUtils.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.c b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.c
index dc7c7c58a9..5c615ede7f 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.h b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.h
index 81fd8672d3..3e88c1af92 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/GuidChk.c b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/GuidChk.c
index bf9b22034e..7b9aa041c5 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/GuidChk.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/GuidChk.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/GuidList.c b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/GuidList.c
index 83ca51d353..873677b7c4 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/GuidList.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/GuidList.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/Makefile
index 6c029f0202..6cf82e4a00 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #  
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.c b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.c
index 2abe621536..bb8f200125 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.h b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.h
index f808ab03a9..f2f58ef94a 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/MakeDeps/MakeDeps.c b/EdkCompatibilityPkg/Sample/Tools/Source/MakeDeps/MakeDeps.c
index fb090bc930..3b780de4ab 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/MakeDeps/MakeDeps.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/MakeDeps/MakeDeps.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/MakeDeps/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/MakeDeps/Makefile
index f24b9ffe71..f5214eb0f8 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/MakeDeps/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/MakeDeps/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #  
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/Makefile
index 57ec6a190b..772417e1f7 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ModifyInf/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/ModifyInf/Makefile
index 523af4d931..f078cf77ee 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ModifyInf/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ModifyInf/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #   
-#  Copyright (c) 2001 - 2006 Intel Corporation.
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2001 - 2006, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ModifyInf/ModifyInf.c b/EdkCompatibilityPkg/Sample/Tools/Source/ModifyInf/ModifyInf.c
index edfcba00a9..3d7a97ca7d 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ModifyInf/ModifyInf.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ModifyInf/ModifyInf.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c)  1999 - 2002 Intel Corporation.
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 1999 - 2002, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Common.h b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Common.h
index b642d092cb..dd2b42cdb9 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Common.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Common.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.c b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.c
index 345e1a9e4a..89527df8ad 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.h b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.h
index 0ed7128d88..6fc54f17c8 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.c b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.c
index bc50183ac3..c8846bf8b4 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.h b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.h
index 625d1e13e4..e8b4dc1236 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.c b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.c
index 28baf5551b..3e60b0344b 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.h b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.h
index f42f97777e..9256bf6b36 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Makefile
index b11d3c44ad..417951cf59 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #  
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/ProcessDsc.c b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/ProcessDsc.c
index 23a8c12845..20faf6f69f 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/ProcessDsc.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/ProcessDsc.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/SetStamp/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/SetStamp/Makefile
index 13fe39efad..52bcc06a99 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/SetStamp/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/SetStamp/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #   
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/SetStamp/SetStamp.c b/EdkCompatibilityPkg/Sample/Tools/Source/SetStamp/SetStamp.c
index 539aced1d9..866c6a4523 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/SetStamp/SetStamp.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/SetStamp/SetStamp.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/SplitFile/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/SplitFile/Makefile
index d67d9b2bbe..65af6f59fd 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/SplitFile/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/SplitFile/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #  
-#  Copyright (c) 2006 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/SplitFile/splitfile.c b/EdkCompatibilityPkg/Sample/Tools/Source/SplitFile/splitfile.c
index 860093ca4f..74ac5a143c 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/SplitFile/splitfile.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/SplitFile/splitfile.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/Makefile
index 993063d4ce..41994c34f7 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #  
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StrGather.c b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StrGather.c
index 107a46306b..f830400b24 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StrGather.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StrGather.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StrGather.h b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StrGather.h
index df175c2db6..d4da8e8690 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StrGather.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StrGather.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.c b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.c
index 8fa01e80ab..6b17f48c6d 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.h b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.h
index 66494c8eee..92801f70f8 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Strip/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/Strip/Makefile
index 99d1b2a0ee..aa2b3cfb63 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Strip/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Strip/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #   
-#  Copyright (c) 2006 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Strip/strip.c b/EdkCompatibilityPkg/Sample/Tools/Source/Strip/strip.c
index 72d76939c6..03e1831ca7 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/Strip/strip.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/Strip/strip.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>                                                         
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/Makefile b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/Makefile
index cb8bac26d3..ff2714c49a 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/Makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/Makefile
@@ -1,7 +1,7 @@
 #/*++
 #  
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StrGather.c b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StrGather.c
index 03b3cc6f41..dd5bdb45ed 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StrGather.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StrGather.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StrGather.h b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StrGather.h
index a14ef923fc..c45fe28552 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StrGather.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StrGather.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.c b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.c
index ac6fef8577..563204bab9 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.h b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.h
index 3a5ad387bf..9e4088bcf8 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/EfiVfr.h b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/EfiVfr.h
index 43e40ab6af..55830c9907 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/EfiVfr.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/EfiVfr.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrCompiler.cpp b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrCompiler.cpp
index 99719367ef..6adef8a41b 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrCompiler.cpp
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrCompiler.cpp
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2010, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrCompiler.h b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrCompiler.h
index 3a6a7f2ea4..0410f84252 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrCompiler.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrCompiler.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2009, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrError.cpp b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrError.cpp
index ecbfd2178e..4a366136bf 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrError.cpp
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrError.cpp
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2010, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrError.h b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrError.h
index 2238ec4be7..3becd9b6e1 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrError.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrError.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2010, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrFormPkg.cpp b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrFormPkg.cpp
index 8a0675b859..ddae865498 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrFormPkg.cpp
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrFormPkg.cpp
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2010, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrFormPkg.h b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrFormPkg.h
index 9091204f99..b890b27a25 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrFormPkg.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrFormPkg.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2010, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrSyntax.g b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrSyntax.g
index 060f85bd99..1a31b2e41d 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrSyntax.g
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrSyntax.g
@@ -1,6 +1,6 @@
 /*++
-Copyright (c) 2004 - 2010, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrUtilityLib.cpp b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrUtilityLib.cpp
index 1080095c87..caadc29da9 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrUtilityLib.cpp
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrUtilityLib.cpp
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2010, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrUtilityLib.h b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrUtilityLib.h
index 70301241c6..38687b948d 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrUtilityLib.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrUtilityLib.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2010, Intel Corporation
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/makefile b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/makefile
index 61fd9e4641..e4424fcc3f 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/makefile
@@ -1,7 +1,7 @@
 #/*++
 #  
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/VcCheck/VcCheck.c b/EdkCompatibilityPkg/Sample/Tools/Source/VcCheck/VcCheck.c
index 32f1c33b8c..42eac7a1d8 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/VcCheck/VcCheck.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/VcCheck/VcCheck.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/VcCheck/makefile b/EdkCompatibilityPkg/Sample/Tools/Source/VcCheck/makefile
index 45d6690869..f34322a4ca 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/VcCheck/makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/VcCheck/makefile
@@ -1,7 +1,7 @@
 #/*++
 #   
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/EfiVfr.h b/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/EfiVfr.h
index d6862119db..c520ad28f5 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/EfiVfr.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/EfiVfr.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2005, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2005, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrCompile.g b/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrCompile.g
index cba6fa6a6a..ce574ada12 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrCompile.g
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrCompile.g
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrServices.cpp b/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrServices.cpp
index e9c54d3387..4d3ba3d318 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrServices.cpp
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrServices.cpp
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004 - 2007, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrServices.h b/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrServices.h
index 6b8c560d63..394f3138c6 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrServices.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrServices.h
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/makefile b/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/makefile
index f0b7db9fa0..b55b09c4ed 100644
--- a/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/makefile
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/makefile
@@ -1,7 +1,7 @@
 #/*++
 #  
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         
-#  All rights reserved. This program and the accompanying materials                          
+#  Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
 #  which accompanies this distribution.  The full text of the license may be found at        
 #  http://opensource.org/licenses/bsd-license.php