Merge lp:~aturriff/boots/boots-apidoc into lp:boots

[Andreas Turriff]

[Andreas Turriff (aturriff)]

Apidocs, proper error on exit from script/parameter command failure.

[Max Goodhart (chromakode)]

I've merged the documentation changes.

review: Approve

=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2010-02-24 20:39:13 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

=== removed file 'LICENSE'
--- LICENSE	2009-11-19 03:52:13 +0000
+++ LICENSE	1970-01-01 00:00:00 +0000
@@ -1,470 +0,0 @@
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     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
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License 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 [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [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
-     Original Code Source Code for Your Modifications.]
-

=== modified file 'boots.py'
--- boots.py	2010-02-24 19:15:28 +0000
+++ boots.py	2010-02-24 20:39:13 +0000
@@ -5,12 +5,11 @@
 # boots.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/api/api.py'
--- boots/api/api.py	2010-02-24 19:15:28 +0000
+++ boots/api/api.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # boots/api/api.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
@@ -41,7 +40,15 @@
 class Server(object):
     """Represents a connection to a database server.
     
-    This object is used to execute commands on a remote server."""
+    This object is used to execute commands on a remote server.
+    Methods:
+    __init__()
+    connect()
+    disconnect()
+    execute()
+    
+    Properties:
+    bool is_connected"""
 
     def __init__(self, hostname, port, auth):
         """Initialize a Server object.
@@ -57,7 +64,9 @@
         self._connection = None
 
     def connect(self):
-        """Connect to the database server whose details were provided through
+        """Establishes database connection.
+
+        Connect to the database server whose details were provided through
         the __init__ method."""
         self._connection = db.connect(
             host     =  self.hostname,  
@@ -68,8 +77,9 @@
 
     @property
     def is_connected(self): 
-        """Property that is True when the Server is connected and False
-        otherwise."""
+        """Describes connection state.
+
+        TRUE if connected, FALSE if disconnected."""
         return self._connection is not None
 
     def _check_connected(self):
@@ -84,6 +94,8 @@
         self._connection = None
     
     def execute(self, query):
+        #FIXME: I don't like how this is phrased, but cannot right now think of a better way to do it.
+        #FIXME: Gotta come back to that, I think.
         """Executes a query, returning an iterator of resulting rows.
         
         The resulting rows are packaged in a 'packet' which is a dict:

=== modified file 'boots/api/errors.py'
--- boots/api/errors.py	2010-02-24 19:15:28 +0000
+++ boots/api/errors.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # errors.py 
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
@@ -36,8 +35,11 @@
 
 class ConsoleError(BootsError):
     """Errors to be displayed to be displayed on the console"""
+<<<<<<< TREE
     pass
 
 class ConnectionError(ConsoleError):
     """Errors related to server connections"""
-    pass
\ No newline at end of file
+    pass=======
+    pass
+>>>>>>> MERGE-SOURCE

=== modified file 'boots/api/nodes/node.py'
--- boots/api/nodes/node.py	2010-02-21 03:57:45 +0000
+++ boots/api/nodes/node.py	2010-02-24 20:39:13 +0000
@@ -1,3 +1,31 @@
+# Boots Client
+# www.launchpad.net/boots
+# www.launchpad.net/drizzle
+# boots/api/nodes/node.py
+#
+# ##### BEGIN LICENSE BLOCK #####
+# Version: GPLv3
+#
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is Boots Client code.
+#
+# The Initial Developer of the Original Code is Clark Boylan, Ken
+# Brotherton, Max Goodman, Victoria Lewis, David Rosenbaum, and Andreas
+# Turriff. Portions created by Clark Boylan, Ken Brotherton, Max Goodman,
+# Victoria Lewis, David Rosenbaum, and Andreas Turriff are Copyright (C)
+# 2009. All Rights Reserved.
+#
+# Contributor(s):
+#
+# ##### END LICENSE BLOCK #####
 from Queue import Queue
 from itertools import chain, tee, repeat
 from threading import Thread, Event, Lock
@@ -11,7 +39,12 @@
         yield e
 
 def alternate_iterators(*iterables):
-    """Iterate over the given iterables, taking turns."""
+    """Iterate over the given iterables, taking turns.
+
+    Takes a list of iterables as input.
+    Yields contents of the iterables.
+    Removes iterable from the list when iterable is finished.
+    Terminates when list is empty."""
     iters = map(iter, iterables)
     while iters:
         for it in iters:
@@ -21,7 +54,10 @@
                 iters.remove(it)
 
 def flatten(x):
-    """If an object is iterable, iterate over it. Otherwise, yield the object."""
+    """Return content objects of an iterable.
+
+    Takes an object as input.
+    If an object is iterable, iterate over it. Otherwise, yield the object."""
     if type(x) is GeneratorType:
         for y in x:
             yield y
@@ -38,7 +74,27 @@
 # FIXME: need a thread safe tee here, perhapse "safetee"?
 
 class BaseNode(object):
+    """Base class for the node system.
+
+    Methods:
+    __init__()
+    status_msg()
+    finalize()
+    insert_before()
+    insert_after()
+    connect_output()
+    disconnect_output()
+
+    Properties:
+    name
+    inputs
+    outputs"""
+
     def __init__(self, name=None, inputs=None, outputs=None):
+    """Constructor of the base node object.
+
+       Initializes the node object.
+       Takes the node name, inputs and outputs as parameters."""
         self.name = name
         self._finalized = False
         
@@ -54,11 +110,13 @@
         
     @property
     def name(self):
+    """Name of the node."""
         # Use a "private" member to avoid name conflicts with Thread
         return self.__name
     
     @name.setter
     def name(self, value):
+    """Sets name of the node."""
         self.__name = value
         
     def __repr__(self):
@@ -70,30 +128,54 @@
                                                      status    = status)
     
     def status_msg(self):
+    """Returns a status message.
+
+       For the base node object, returns NONE."""
         return None
     
     def finalize(self):
+    """Finalizes node setup.
+
+       Ensures that a node has the chance to complete its setup without
+       its input and output connections changing. In the base node, this
+       is not required. Derived classes will need to implement
+       _finalize(self)"""
         assert not self._finalized, "Node already finalized."
         self._finalize()
         self._finalized = True    
     
     def insert_before(self, node):
+    """Inserts the node before another node.
+
+       Accepts a node as input and prepends the node this method is
+       called from to that node."""
         for input in list(self.inputs):
             input.disconnect_output(self)
             input.connect_output(node)
         node.connect_output(self)
         
     def insert_after(self, node):
+    """Inserts the node after another node.
+
+       Accepts a node as input and appends the node this method is
+       called from to that node."""
         for output in list(self.outputs):
             self.disconnect_output(output)
             node.connect_output(output)
         self.connect_output(node)
         
     def connect_output(self, output_node):
+    """Connects output of the node to the input of another node.
+
+       Accepts a target node as parameter and connects this node's output to the
+       parameter's input."""
         self.outputs.add(output_node)
         output_node.inputs.add(self)
         
     def disconnect_output(self, output_node):
+    """Disconnects the output of this node from the input of another node.
+
+       The opposite of connect_output, taking the same parameters."""
         self.outputs.remove(output_node)
         output_node.inputs.remove(self)
         
@@ -105,11 +187,41 @@
         """Send data to all connected output nodes."""
         for output in self.outputs:
             output.put(data)
+    
+    def _finalize(self):
+        pass
 
 class NodeGraph(object):
-    """Control and manage a graph of nodes."""
+    """Control and manage a graph of nodes.
+
+       Methods:
+       __init__()
+       from_sequence()
+       edges()
+       add()
+       add_input()
+       add_output()
+       add_connected()
+       link_output()
+       unlink_output()
+       finalize()
+       start()
+       put()
+       run()
+
+       Properties:
+       name
+       nodes
+       input_link
+       output_link
+       auto_process
+       async"""
     
     def __init__(self, name=None, nodes=None, auto_process=False):
+        """Creates a node graph object.
+
+        Accepts the name of the graph, the content nodes, and whether or not to automatically
+        process the graph."""
         self.name = name
         self.nodes = set()
         # TODO: auto-connect nodes in node graph to the input and output links
@@ -124,8 +236,14 @@
     
     @staticmethod
     def from_sequence(node_seq):
-        """Connect a linear sequence of nodes, with possible nested sequences."""
-        
+        """Connects a sequence of nodes.
+
+        Connects a sequence of nodes, with branches for sub-sequences.
+        For example, an input (1,2,3) will return -1-2-3-; an input of
+        ((1,2,3),a,b,c) will return -1-2-3-
+                                     |
+                                      -a-b-c
+        """
         def get_first(obj):
             try:
                 return obj[0]
@@ -162,15 +280,25 @@
         return output_edges
         
     def add(self, *nodes):
-        """Add individual nodes to the collection."""
+        """Add individual nodes to the collection.
+
+        Accepts a list of nodes to be added to the collection."""
         return self._add(False, nodes)
     
     def add_input(self, *nodes):
+        """Adds nodes to the input link.
+
+        Accepts a list of nodes and adds them to the input_link of this
+        graph."""
         self.add(*nodes)
         for node in nodes:
             self.input_link.connect_output(node)
         
     def add_output(self, *nodes):
+        """Adds nodes to the output link.
+
+        Accepts a list of nodes and adds them to the output_link of this
+        graph."""
         self.add(*nodes)
         for node in nodes:
             node.connect_output(self.output_link)
@@ -193,9 +321,11 @@
         return nodes
     
     def link_output(self, output_graph):
+        """Link output link of this node graph to input of another."""
         self.output_link.link_output(output_graph.input_link)
         
     def unlink_output(self, output_graph):
+        """Unlink output link of this node graph from input of another."""
         self.output_link.unlink_output(output_graph.input_link)
         
     def __getitem__(self, name):
@@ -243,6 +373,9 @@
                 node.insert_before(*self.add(QueueNode()))
     
     def finalize(self):
+        """Finalize all nodes in node graph.
+
+        Also processes graph if auto_process is set."""
         assert not self._finalized, "Graph already finalized."
         
         if self.auto_process:
@@ -263,9 +396,11 @@
                 self.async = True
             
     def put(self, data):
+        """Put data on input link."""
         self.input_link.put(data)
     
     def run(self):
+        """Output data."""
         if not self.async:
             for data in self.output_link:
                 if data is StopIteration:
@@ -293,7 +428,11 @@
         pass
     
 class QueueNode(BaseNode):
-    """Thread-safe queue that buffers pushed data for pull access."""
+    """Thread-safe queue that buffers pushed data for pull access.
+
+    Methods:
+    __init__()
+    put()"""
     
     def __init__(self, name=None, inputs=None, outputs=None, include_stop=False):
         BaseNode.__init__(self, name, inputs, outputs)
@@ -317,7 +456,23 @@
                 yield data
             
 class LinkNode(BaseNode):
+    """Link node to connect to input and output methods.
+
+    Methods:
+    __init__()
+    link_output()
+    unlink_output()
+    put()
+
+    Properties:
+    input_links
+    input_lock
+    output_links
+    output_lock
+    mortal"""
+
     def __init__(self, name=None, inputs=None, outputs=None, mortal=False):
+        """Initializes link node."""
         BaseNode.__init__(self, name, inputs, outputs)
         self.input_links = set()
         self.input_lock = Lock()
@@ -326,18 +481,21 @@
         self.mortal = mortal
         
     def link_output(self, output_link):
+        """Links own output to another unit's input link."""
         with self.input_lock:
             with output_link.output_lock:
                 self.output_links.add(output_link)
                 output_link.input_links.add(self)
         
     def unlink_output(self, output_link):
+        """Unlinks own output fro manother unit's input link."""
         with self.input_lock:
             with output_link.output_lock:
                 self.output_links.remove(output_link)
                 output_link.input_links.remove(self)
                 
     def put(self, data):
+        """Output data."""
         if not (data is StopIteration and not self.mortal):
             self._put_outputs(data)
             

=== modified file 'boots/app/client_config.py'
--- boots/app/client_config.py	2010-02-24 19:26:55 +0000
+++ boots/app/client_config.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # boots/app/client_config.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/app/info.py'
--- boots/app/info.py	2010-02-24 19:15:28 +0000
+++ boots/app/info.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # boots/app/info.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/console.py'
--- boots/lib/console.py	2010-02-24 19:15:28 +0000
+++ boots/lib/console.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/console.py 
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
@@ -157,15 +156,17 @@
                 result_graph.start()
                 result_graph.run()
 
+                if isinstance(result, Exception) and isinstance(self.driver, (ScriptDriver, StringDriver):
+                    self.quit(1);
         self.quit()
         
-    def quit(self):
+    def quit(self, exitcode = 0):
         if self.driver.is_interactive:
             self.presenter.presenter_graph.put("Boots quit.")
             
         self.hooks["unload"].call()
         self.disconnect(None, None)
-        sys.exit(0)
+        sys.exit(exitcode)
 
     def meta_connect(self, host=None, port=None, database=None):
         if host is None: 

=== modified file 'boots/lib/hook.py'
--- boots/lib/hook.py	2010-02-21 10:04:23 +0000
+++ boots/lib/hook.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/hook.py 
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
@@ -59,4 +58,4 @@
             else:
                 dead_refs.add(callback)
         self.callbacks -= dead_refs
-                
\ No newline at end of file
+                

=== modified file 'boots/lib/lingos/bash_external.py'
--- boots/lib/lingos/bash_external.py	2010-02-08 00:06:50 +0000
+++ boots/lib/lingos/bash_external.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/lingos/python.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/lingos/external.py'
--- boots/lib/lingos/external.py	2010-02-08 19:04:36 +0000
+++ boots/lib/lingos/external.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/lingos/python.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/lingos/lingo.py'
--- boots/lib/lingos/lingo.py	2010-02-21 10:11:22 +0000
+++ boots/lib/lingos/lingo.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/lingos/lingo.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/lingos/lisp/builtins.py'
--- boots/lib/lingos/lisp/builtins.py	2010-01-31 06:48:28 +0000
+++ boots/lib/lingos/lisp/builtins.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/lingos/lisp/builtins.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/lingos/lisp/lexer.py'
--- boots/lib/lingos/lisp/lexer.py	2010-01-22 05:58:25 +0000
+++ boots/lib/lingos/lisp/lexer.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/lingos/lisp/lexer.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/lingos/lisp/lisp.py'
--- boots/lib/lingos/lisp/lisp.py	2010-02-07 08:52:29 +0000
+++ boots/lib/lingos/lisp/lisp.py	2010-02-24 20:39:13 +0000
@@ -5,12 +5,11 @@
 # lib/lingos/lisp/lisp.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/lingos/lisp/objects.py'
--- boots/lib/lingos/lisp/objects.py	2010-01-31 06:34:57 +0000
+++ boots/lib/lingos/lisp/objects.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/lingos/lisp/objects.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/lingos/lisp/parser.py'
--- boots/lib/lingos/lisp/parser.py	2010-01-23 23:32:39 +0000
+++ boots/lib/lingos/lisp/parser.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/lingos/lisp/parser.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/lingos/piped_sql.py'
--- boots/lib/lingos/piped_sql.py	2010-02-21 03:57:45 +0000
+++ boots/lib/lingos/piped_sql.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/lingos/sql.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/lingos/python.py'
--- boots/lib/lingos/python.py	2010-02-20 23:42:07 +0000
+++ boots/lib/lingos/python.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/lingos/python.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/lingos/sql.py'
--- boots/lib/lingos/sql.py	2010-02-16 00:38:41 +0000
+++ boots/lib/lingos/sql.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/lingos/sql.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/ui/components/metacommands.py'
--- boots/lib/ui/components/metacommands.py	2010-02-07 01:52:52 +0000
+++ boots/lib/ui/components/metacommands.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/console.py 
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/ui/generic.py'
--- boots/lib/ui/generic.py	2010-02-22 19:33:02 +0000
+++ boots/lib/ui/generic.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # boots/lib/ui/generic.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'boots/lib/ui/plain.py'
--- boots/lib/ui/plain.py	2010-02-24 19:26:55 +0000
+++ boots/lib/ui/plain.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # lib/ui/plain.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'setup.py'
--- setup.py	2010-02-17 03:49:02 +0000
+++ setup.py	2010-02-24 20:39:13 +0000
@@ -5,12 +5,11 @@
 # setup.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# Version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
@@ -45,6 +44,7 @@
 boots_packages = ["boots"] + boots_api_packages +\
                  boots_app_packages + boots_lib_packages
 
+#TODO: Fix license
 setup(name="boots",
       version=boots_version,
       description="Drizzle CLI Client",
@@ -61,7 +61,7 @@
             "Environment :: Console",
             "Intended Audience :: Developers",
             "Intended Audience :: System Administrators",
-            "License :: OSI Approved :: Mozilla Public License 1.1 (MPL 1.1)",
+            "License :: OSI Approved :: GNU General Public License (GPL)",
             "Operating System :: POSIX",
             "Programming Language :: Python",
             "Programming Language :: Python :: 2.6",

=== modified file 'tests/boots/api/nodes/node_tests.py'
--- tests/boots/api/nodes/node_tests.py	2010-02-21 21:24:59 +0000
+++ tests/boots/api/nodes/node_tests.py	2010-02-24 20:39:13 +0000
@@ -5,12 +5,11 @@
 # tests/boots/tests.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'tests/boots/boots_unit_test.py'
--- tests/boots/boots_unit_test.py	2010-02-17 03:49:02 +0000
+++ tests/boots/boots_unit_test.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # tests/boots/boots_unit_test.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'tests/boots/lib/lingos/lingo_tests.py'
--- tests/boots/lib/lingos/lingo_tests.py	2010-02-21 21:24:59 +0000
+++ tests/boots/lib/lingos/lingo_tests.py	2010-02-24 20:39:13 +0000
@@ -4,12 +4,11 @@
 # tests/boots/tests.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

=== modified file 'tests/boots/tests.py'
--- tests/boots/tests.py	2010-02-17 04:49:04 +0000
+++ tests/boots/tests.py	2010-02-24 20:39:13 +0000
@@ -5,12 +5,11 @@
 # tests/boots/tests.py
 #
 # ##### BEGIN LICENSE BLOCK #####
-# Version: MPL 1.1
+# Version: GPLv3
 #
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# The contents of this file are subject to the GNU General Public License
+# version 3 (the "License"); you may not use this file except in
+# compliance with the License.
 #
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the