Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

* 'master' of ssh://sources.redhat.com/git/systemtap:
  2008-03-27  Frank Ch. Eigler  <fche@elastic.org>
  2008-03-27  Frank Ch. Eigler  <fche@elastic.org>
  2008-03-26  Frank Ch. Eigler  <fche@elastic.org>
  Revert "dummy commit"
  dummy commit

Conflicts:

	ChangeLog
	testsuite/ChangeLog

diff --cc ChangeLog
index 3d66fad748791145356463c3fa43ecea70ddb0cc,91b09b03c3a6ffec2031d46e1b116a48c0624fc9..8eb41250036a0bcb36bf0c634dc8ed347029e121
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,12 +1,17 @@@
 +2008-03-31  Frank Ch. Eigler  <fche@elastic.org>
 +
 +      * configure.ac: Bump version to 0.7.
 +      * configure: Regenerated.
 +
+ 2008-03-27  Frank Ch. Eigler  <fche@elastic.org>
+ 
+       * tapsets.cxx (common_probe_entryfn_prologue): Clear last_stmt.
+ 
+ 2008-03-26  Frank Ch. Eigler  <fche@elastic.org>
+ 
+       * translate.cxx (emit_function): Set context last_stmt, in case
+       an error occurs during the function.
+ 
  2008-03-25  Frank Ch. Eigler  <fche@elastic.org>
  
        * stap.1.in: Clarify utility of epilogue type probe aliases.

diff --cc testsuite/ChangeLog
index 6b988a7d83224dab122371358c8c90ce805daee5,44eb50a750793de3a0a5222db81d86451b63bdd5..da7891274de1a221bf70bd506cb14a991765e412
--- 1/testsuite/ChangeLog
--- 2/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
 +2008-03-31  Frank Ch. Eigler  <fche@elastic.org>
 +
 +      * configure.ac: Bump version to 0.7.
 +      * configure: Regenerated.
 +
+ 2008-03-27  Frank Ch. Eigler  <fche@elastic.org>
+ 
+       * systemtap.base/cmd_parse.exp: Don't assume $SHELL=bash.
+ 
  2008-03-23  Frank Ch. Eigler  <fche@elastic.org>
  
        * lib/stap_run.exp (stap_run): Ignore missing debuginfo warnings.