Merge branch '2.7'

Conflicts:
	Makefile
This commit is contained in:
Natanael Copa 2011-03-31 09:56:47 +00:00
commit 382e470396

View File

@ -523,6 +523,7 @@ builddate = $builddate
packager = ${PACKAGER:-"Unknown"}
size = $size
arch = $parch
origin = $pkgname
EOF
local i deps
deps="$depends"