Merge remote-tracking branch 'origin/f18'

Catches rawhide up to the final 2.1 release, to preserve the upgrade path
if nothing else.  (We'll start on 2.2 snapshots soon though.)

.gitignore

@@ -28,3 +28,4 @@ systemtap-1.3.tar.gz
 /systemtap-2.1-0.353.g43e1259.tar.gz
 /systemtap-2.1-0.354.g75c7136.tar.gz
 /systemtap-2.1-0.385.gab733d5.tar.gz
+/systemtap-2.1.tar.gz

sources

@@ -1 +1 @@
-31d915dc37f4d8a8669ab5684c275750  systemtap-2.1-0.385.gab733d5.tar.gz
+86a01af0139c868aa1736ebf8c640caa  systemtap-2.1.tar.gz

systemtap.spec

@@ -31,7 +31,7 @@
 
 Name: systemtap
 Version: 2.1
-Release: 0.385.gab733d5%{?dist}
+Release: 1%{?dist}
 # for version, see also configure.ac
 
 
@@ -62,7 +62,7 @@ Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
 #Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz
-Source: %{name}-%{version}-0.385.gab733d5.tar.gz
+Source: %{name}-%{version}.tar.gz
 
 # Build*
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -695,6 +695,9 @@ exit 0
 # ------------------------------------------------------------------------
 
 %changelog
+* Wed Feb 13 2013 Serguei Makarov <smakarov@redhat.com> - 2.1-1
+- Upstream release.
+
 * Mon Feb 11 2013 Lukas Berk <lberk@redhat.com> - 2.1-0.385.gab733d5
 - Automated weekly rawhide release