Merge branch 'dmigen' into phcoder
commit3aad8356ce06fbf869dcdc8de58d11a6311134fc
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 16 Jul 2009 19:32:26 +0000 (16 21:32 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 16 Jul 2009 19:32:26 +0000 (16 21:32 +0200)
treead6b98f90944fef2c296bed8a93b770bea234cca
parent323840cc0fca3baa07465ad2b7443316765f79e4
parentb1922c26301e5fafc1bf37b94e524b71de2d0d3e
Merge branch 'dmigen' into phcoder
conf/i386-pc.rmk