Merge branch 'master' into v3

Conflicts:
	debian/changelog

doc/install.mdwn

@@ -33,3 +33,10 @@ To build and use git-annex, you will need:
   * [ikiwiki](http://ikiwiki.info) (optional; used to build the docs)
 
 Then just [[download]] git-annex and run: `make; make install`
+
+## Using cabal
+
+As a haskell package, git-annex can be built using cabal. For example:
+
+	cabal configure
+	cabal install --bindir=$HOME/bin

doc/install/comment_1_d9f7b851567445c7aa7ebbb440781819._comment

@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://peter-simons.myopenid.com/"
- ip="84.189.1.247"
- subject="Why isn't this package built with Cabal?"
- date="2011-03-23T11:31:06Z"
- content="""
-It would be a lot easier to compile this package, if it had a Cabal file to describe the build; especially the build-time dependencies. Why isn't Cabal used?
-"""]]

doc/install/comment_2_cf0f829536744098d6846500db998b6a._comment

@@ -1,17 +0,0 @@
-[[!comment format=mdwn
- username="http://joey.kitenet.net/"
- nickname="joey"
- subject="comment 2"
- date="2011-03-23T15:18:29Z"
- content="""
-Because I haven't learned Cabal yet.
-
-But also because I've had bad experiences with both a) tying a particular program to a particular language's pet build system and then having to add ugliness when I later need to do something in the build that has nothing to do with that language and b) as a user, needing to deal with the pet build systems of languages when I just need to make some small change to the build process that is trivial in a Makefile.
-
-With that said, I do have a configure program written in Haskell, so at least it doesn't use autotools. :)
-
-Update: I did try using cabal, but git-annex includes 3 programs, and they
-all link to a lot of git-annex modules, and cabal wanted to build nearly
-every module 3 times, which was too slow for me and I could not find a way
-around.
-"""]]