Merge commit '2a2f4f5'

author Joe Neeman <joeneeman@gmail.com>

Sat, 18 Aug 2007 10:11:04 +0000 (20:11 +1000)

committer Joe Neeman <joeneeman@gmail.com>

Sat, 18 Aug 2007 10:11:04 +0000 (20:11 +1000)
author Joe Neeman <joeneeman@gmail.com>
Sat, 18 Aug 2007 10:11:04 +0000 (20:11 +1000)
committer Joe Neeman <joeneeman@gmail.com>
Sat, 18 Aug 2007 10:11:04 +0000 (20:11 +1000)
diff --cc Documentation/user/advanced-notation.itely
Simple merge
author	Joe Neeman <joeneeman@gmail.com>
	Sat, 18 Aug 2007 10:11:04 +0000 (20:11 +1000)
committer	Joe Neeman <joeneeman@gmail.com>
	Sat, 18 Aug 2007 10:11:04 +0000 (20:11 +1000)