[plowshare/f15: 14/14] Merge with master

[Elder Marco]

commit be7255695734b196e5d6673d0ae00b6ad1dd1be1
Merge: e8d5aaa 204baf1
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Nov 15 20:42:47 2011 -0200

    Merge with master

 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---