Merge branch 'maint'

Conflicts:
	lib/libalpm/sync.c
	src/util/pactree.c

1 files changed, 1 insertions, 0 deletions

diff --git a/doc/index.txt b/doc/index.txt
index f7a16105..b221d237 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -71,6 +71,7 @@ Releases
 [frame="topbot",grid="none",options="header,autowidth"]
 !======
 !Version !Date
+!4.0.2 !2011-02-11
 !4.0.1 !2011-11-20
 !4.0.0 !2011-10-13
 !4.0.0rc2 !2011-09-22