Misakes on merge bzr-1.15 onto bzr-1.14

[Bob Tanner]

Typo in my PQM configuration and I submitted bzr-1.15 onto bzr-1.14!

I apologize.

I sent personal mail to Robert and Martin asking for an uncommit.

Again, I apologize.

-- 
Bob Tanner <tanner at real-time.com>          | Phone : (952 943-8700
http://www.real-time.com, Minnesota, Linux | Fax   : (952)943-8500
Key fingerprint = F785 DDFC CF94 7CE8 AA87 3A9D 3895 26F1 0DDB E378