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

* 'master' of ssh://sources.redhat.com/git/systemtap:
  Added testsuite/systemtap.examples/.gitignore file.

diff --cc testsuite/systemtap.examples/ChangeLog
index 512ef9fe3331e2e288fee4b2ad2d7d1aefe1b8f6,db334b3f2a63c01b9d7a0d0c13b4b408f0764b38..d5840f96c384136a9a63e752ef0e25f4ff32daae
--- 1/testsuite/systemtap.examples/ChangeLog
--- 2/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@@ -1,13 -1,7 +1,18 @@@
 +2008-08-07  Frank Ch. Eigler  <fche@elastic.org>
 +
 +      * *index.txt, *index.html: New generated files.
++      * .gitignore: Zap it.
 +      * html/*, examples-index-gen.pl: Adapt to html/ boilerplate subdir.
 +
 +2008-08-07  Frank Ch. Eigler  <fche@elastic.org>
 +
 +      * small_demos: Unique parts kept, others dropped.
 +      * all other samples: Moved into new subdirectories.
 +
+ 2008-08-07  David Smith  <dsmith@redhat.com>
+ 
+       * .gitignore: New file.
+ 
  2008-08-07  Mark Wielaard  <mwielaard@redhat.com>
  
        * examples-index-gen.pl: New file.