Merge branch 'bless' into phcoder
commitf268e90d60b932eacfdd7e513169bc55294af04f
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 16 Jul 2009 19:34:52 +0000 (16 21:34 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 16 Jul 2009 19:34:52 +0000 (16 21:34 +0200)
tree9fb7eaf1792605d46b60a7330eea2ef83bc4dfc1
parent0aa867834776a21f3ef1238ce06f8ebac1cbf065
parent8a492f1e017071ebf0ee2fae4b66857595d4c6ad
Merge branch 'bless' into phcoder

Conflicts:
ChangeLog
conf/common.rmk
ChangeLog
conf/common.rmk
conf/i386-pc.rmk