[plowshare/f16: 11/11] Merge with master branch

[Elder Marco]

commit 456ab4fb71e38e78ffe190bd77cd65fdf0bc0cbe
Merge: e44ce1e 204baf1
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Nov 15 20:46:18 2011 -0200

    Merge with master branch

 .gitignore |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 7551174,c806f15..18b30d9
--- a/.gitignore
+++ b/.gitignore
@@@ -6,7 -6,9 +6,10 @@@
  /plowshare-SVN-r1645-snapshot.tar.gz
  /plowshare-SVN-r1657-snapshot.tar.gz
  /plowshare-snapshot-git20110816.tar.gz
 +/plowshare-snapshot-git20110904.tar.gz
+ /plowshare-snapshot-git20110828.tar.gz
+ /plowshare-snapshot-git20110904.tar.gz
+ /plowshare-snapshot-git20110914.tar.gz
  /plowshare-snapshot-git20110918.tar.gz
  /plowshare-snapshot-git20110926.tar.gz
  /plowshare-snapshot-git20111023.tar.gz