Public Git Hosting - grub2/phcoder.git/commit

commit	d1aa0f4490ab93195cbc171ef3275b06a3de4cfd
author	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Thu, 16 Jul 2009 16:46:47 +0000 (16 18:46 +0200)
committer	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Thu, 16 Jul 2009 16:46:47 +0000 (16 18:46 +0200)
tree	5b9b56150ad91df4b28517923618006556382c9b	tree \| snapshot (tar.gz zip)
parent	825ef6b9d21043d9b47b2200924ba662f529e040	commit \| diff
parent	d52bd5fc4275185f17b980073b56573328b0ee85	commit \| diff

Merge branch 'mainline' into collin

Conflicts:
ChangeLog
conf/common.rmk