Merge remote branch 't0m/swann' into swann

Conflicts:
	Changes
	script/bootstrap.pl
	script/env

diff --cc Changes
index 7be1e70,5d63650..63b8b86
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,11 -1,6 +1,12 @@@
  This file documents the revision history for Perl extension Gitalist.
  
 +    - Fix for loadCommitInfo.
 +    - Fix tests to work with local-libbery.
 +    - Correct example link and FCGI script.
 +    - Bumping version and updated Changes appropriately.
 +    - Throttle the commit info loading.
 +    - Update bootstrapping for local::lib 1.006000.
+     - Fixed author_* barewords in Makefile.PL.
  
  0.001003 2010-04-21
      - Added folder / file icons in tree view (Foxtons)

diff --cc Makefile.PL
Simple merge

diff --cc script/bootstrap.pl
index 269f899,c72e86c..efbb1e8
--- 1/script/bootstrap.pl
--- 2/script/bootstrap.pl
+++ b/script/bootstrap.pl
@@@ -50,9 -50,7 +50,8 @@@ $CPAN::Config->{prefs_dir} = "$ENV{HOME
  
  force(qw/install local::lib/);
  
 +require lib::core::only; # Turn lib::core:only on
  require local::lib; # Turn local::lib on
- lib::core::only->import();
  local::lib->import( $target );
  
  # Become fully self contained