Add notice of triple-licensing

Author: reepong

LICENSE

@@ -1,11 +1,12 @@
-This package, the RabbitMQ Java client library is dual-licensed under
-the MPL and the GPL v2. For the MPL, please see
-LICENSE-MPL-RabbitMQ. For the GPL v2, please see LICENSE-GPL2.
+This package, the RabbitMQ Java client library is triple-licensed under
+the Mozilla Public License 1.1 ("MPL"), the GNU General Public License
+version 2 ("GPL") and the Apache License version 2 ("ASL"). For the MPL,
+please see LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2.
+For the ASL, please see LICENSE-APACHE2.
 
-The RabbitMQ Java client library includes software under the Apache
-Licence v2. For this license, please see LICENSE-APACHE2. For
-attribution of copyright and other details of provenance, please refer
-to the source code.
+The RabbitMQ Java client library includes third-party software under the
+ASL. For this license, please see LICENSE-APACHE2. For attribution of
+copyright and other details of provenance, please refer to the source code.
 
 If you have any questions regarding licensing, please contact us at 
 info@rabbitmq.com.

LICENSE-MPL-RabbitMQ

@@ -429,7 +429,7 @@
      Initial Developer may designate portions of the Covered Code as
      "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
      Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
+     Your choice of the MPL or the alternative licenses, if any, specified
      by the Initial Developer in the file described in Exhibit A.
 
 EXHIBIT A -Mozilla Public License.
@@ -447,8 +447,20 @@ EXHIBIT A -Mozilla Public License.
      The Original Code is RabbitMQ.
 
      The Initial Developer of the Original Code is VMware, Inc.
-     Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.''
-
+     Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the GNU General Public License version 2 (the  "GPL2"), or
+     the Apache License version 2 (the "ASL2") in which case the
+     provisions of GPL2 or the ASL2 are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the GPL2 or the ASL2 and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the GPL2 or the ASL2.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL, the GPL2 or the ASL2.''
+     
      [NOTE: The text of this Exhibit A may differ slightly from the text of
      the notices in the Source Code files of the Original Code. You should
      use the text of this Exhibit A rather than the text found in the